Merge branch 'maint-0.2.9'
commit76d79d597aeba1d9182414acf038ed376cd5139c
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Feb 2017 12:48:42 +0000 (15 07:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Feb 2017 12:48:42 +0000 (15 07:48 -0500)
tree4a666199c7c3d186060a162d86a9d82b0044ce3e
parentdec7dc3d823a8a9cc1d9d75d1b803a6e6b308a8e
parent5d88267bf47fb532b53691ab428cbfd9db3881cf
Merge branch 'maint-0.2.9'
src/or/dirserv.c
src/or/dirvote.c
src/or/policies.c
src/or/routerlist.c
src/or/routerparse.c
src/or/routerparse.h
src/test/test_policy.c