[tor-commits] [tor/maint-0.2.9] Merge branch 'bug21278_redux_029_squashed' into maint-0.2.9

commit ec6b5a098dcd1a264e84405006cd6a645d415ac4 Merge: eeb7435 3c4da8a Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 15 07:48:18 2017 -0500

Merge branch 'bug21278_redux_029_squashed' into maint-0.2.9

changes/bug21278_prevention | 4 +++ src/or/dirserv.c | 10 +++++++ src/or/routerparse.c | 72 ++++++++++++++++++++++++++++++++++----------- src/or/routerparse.h | 3 ++ 4 files changed, 72 insertions(+), 17 deletions(-)