commit bb23ad3e47d2953079fb1d8d7c02db939a30633b Merge: 10e442b e2e09a2 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 16 08:48:28 2015 -0500 Merge remote-tracking branch 'teor/feature17863' changes/feature17863 | 6 ++++ src/common/address.c | 2 ++ src/or/policies.c | 12 +++++++ src/or/routerparse.c | 9 +++-- src/test/test_policy.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 113 insertions(+), 3 deletions(-)