[tor-commits] [tor/master] Merge branch '13605_reduced_exit_squashed'

[nickm at torproject.org]

commit 1f9764f90dfaf31abfb9ffb44601cf98f3d5a67e
Merge: 4700ba6c3 00e781142
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 31 13:37:39 2017 -0400

    Merge branch '13605_reduced_exit_squashed'

 changes/ticket13605 |   5 +++
 doc/tor.1.txt       | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/or/config.c     |   1 +
 src/or/or.h         |   1 +
 src/or/policies.c   |  39 ++++++++++++++++----
 src/or/policies.h   |   3 +-
 6 files changed, 142 insertions(+), 8 deletions(-)