Merge branch 'maint-0.2.9' into maint-0.3.0
commit03b4dd92a4c359fb2f699c579ed6dbcd73981267
authorNick Mathewson <nickm@torproject.org>
Thu, 21 Dec 2017 15:49:40 +0000 (21 10:49 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 21 Dec 2017 15:49:40 +0000 (21 10:49 -0500)
tree7caabdc7ee7602fd6d217f8be8de723e1d94668e
parent08ed0d79308b308f690b80d65b22be11a97caf09
parent79a50afa0e3dd44fc5ef80806ccda501fab5a718
Merge branch 'maint-0.2.9' into maint-0.3.0
src/or/or.h
src/or/relay.c
src/or/relay.h