Merge branch 'maint-0.2.9'
commit800dff13080111b1ce1c2f5e28d9ba326299f62a
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 14:32:21 +0000 (7 09:32 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 14:32:21 +0000 (7 09:32 -0500)
tree5eb0f55bd231efd1f60c9d89b3c770e26148a48a
parenta415fee58abf7285e4d42652755b8f34da273f6d
parente4b793fe41fc09cc1f7753cfe90b74095a49a34f
Merge branch 'maint-0.2.9'
src/or/directory.c
src/or/directory.h
src/or/networkstatus.c