commit b257e34583d428dc0f9b6f06ca3f470e794ab513 Merge: 98da122 a659a3f Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 16 08:20:15 2015 -0400

Merge remote-tracking branch 'teor/bug16069-bug17027'

changes/bug16069-exit-policy-rule6 | 20 +++ changes/bug17027-reject-private-all-interfaces | 6 + doc/tor.1.txt | 39 ++-- src/common/address.c | 146 ++++++++++++--- src/common/address.h | 40 ++++- src/config/torrc.minimal.in-staging | 15 +- src/config/torrc.sample.in | 15 +- src/or/policies.c | 212 +++++++++++++++++++--- src/or/policies.h | 12 +- src/or/router.c | 2 +- src/or/routerparse.c | 81 ++++++++- src/or/routerparse.h | 2 +- src/or/routerset.c | 17 +- src/test/test_address.c | 230 ++++++++++++++++++++++-- src/test/test_policy.c | 192 +++++++++++++++++--- src/test/test_routerset.c | 7 +- 16 files changed, 900 insertions(+), 136 deletions(-)