[tor-commits] [tor/master] Merge branch 'getinfo-private-exitpolicy-v4-squashed'

[nickm at torproject.org]

commit 35e886fe13a81b36c8a620f7046e6e9e6c088d01
Merge: 8a41d2a 10a6390
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 20 10:48:28 2015 -0500

    Merge branch 'getinfo-private-exitpolicy-v4-squashed'

 changes/bug17027-reject-private-bind-port |    7 +
 changes/getinfo-private-exitpolicy        |    6 +
 doc/tor.1.txt                             |   13 +-
 src/or/config.c                           |    9 +-
 src/or/config.h                           |    4 +-
 src/or/control.c                          |    6 +
 src/or/policies.c                         |  429 ++++++++++++++++++++++-------
 src/or/policies.h                         |   30 +-
 src/or/router.c                           |   39 +--
 src/test/test_policy.c                    |  410 ++++++++++++++++++++++++++-
 10 files changed, 780 insertions(+), 173 deletions(-)