Merge branch 'maint-0.2.9' into maint-0.3.0
commit2b26815e09760cc84b18791bdbfca27c7b8334f4
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Sep 2017 21:49:18 +0000 (11 17:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Sep 2017 21:49:18 +0000 (11 17:49 -0400)
tree5ece956fc3700f53b3c32e2292303b2d7e749de9
parentc894e9d3d44bceaf209a9b73c2c43911af3eb1a8
parent6cd5a80275614105ccf8794465b6ba5c0c5e8f3f
Merge branch 'maint-0.2.9' into maint-0.3.0
src/ext/csiphash.c
src/or/buffers.c
src/or/connection_edge.c
src/or/dns.c
src/or/relay.c