commit 78196c8822ec8dda5df95428dbb4ae96ec4d2b7f Merge: dfa41ac 514f004 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 5 19:10:08 2016 -0400

Merge remote-tracking branch 'teor/bug18456'

changes/bug18456 | 6 ++++ doc/tor.1.txt | 28 +++++++++++------- src/or/config.c | 3 ++ src/or/control.c | 2 +- src/or/main.c | 8 +++--- src/or/or.h | 8 +++++- src/or/policies.c | 78 ++++++++++++++++++++++++++++++++++++-------------- src/or/policies.h | 7 +++-- src/test/test_policy.c | 34 +++++++++++++++++++++- 9 files changed, 133 insertions(+), 41 deletions(-)