[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug20306_029' into maint-0.2.9

[nickm at torproject.org]

commit 89ec191b6885d8e65f7cbdf1a56e2627c3aec75a
Merge: 286fa94 d73c671
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 8 18:51:07 2016 -0500

    Merge remote-tracking branch 'public/bug20306_029' into maint-0.2.9

 changes/bug20306_029   |  4 ++++
 src/or/policies.c      | 37 +++++++++++++++++--------------------
 src/or/policies.h      |  3 ++-
 src/or/router.c        |  4 ++--
 src/or/routerparse.c   |  2 +-
 src/test/test_policy.c | 18 ++++++++++--------
 6 files changed, 36 insertions(+), 32 deletions(-)