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

[nickm at torproject.org]

commit 563b8d9f221c935ab5e4095729ea1fe0c905b7b3
Merge: 1166174 5d88267
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:51:01 2017 -0500

    Merge branch 'maint-0.2.9' into release-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(-)