[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

commit 76d79d597aeba1d9182414acf038ed376cd5139c Merge: dec7dc3 5d88267 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 15 07:48:42 2017 -0500

Merge branch 'maint-0.2.9'

changes/bug21278_extras | 3 ++ changes/bug21278_prevention | 4 ++ changes/trove-2017-001.2 | 8 +++ src/or/dirserv.c | 10 ++++ src/or/dirvote.c | 30 ++++++++--- src/or/policies.c | 58 ++++++++++----------- src/or/policies.h | 2 +- src/or/routerlist.c | 2 +- src/or/routerparse.c | 121 +++++++++++++++++++++++++++++++------------- src/or/routerparse.h | 3 ++ src/test/test_policy.c | 8 +-- 11 files changed, 170 insertions(+), 79 deletions(-)