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

[nickm at torproject.org]

commit 5d88267bf47fb532b53691ab428cbfd9db3881cf
Merge: ec6b5a0 9f71fde
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:48:30 2017 -0500

    Merge branch 'bug21278_extra_029' into maint-0.2.9

 changes/bug21278_extras |  3 +++
 src/or/dirvote.c        | 30 ++++++++++++++++++-------
 src/or/policies.c       | 58 ++++++++++++++++++++++++-------------------------
 src/or/policies.h       |  2 +-
 src/or/routerlist.c     |  2 +-
 src/test/test_policy.c  |  8 +++----
 6 files changed, 60 insertions(+), 43 deletions(-)