[tor-commits] [tor/master] Merge branch 'feature17975'

[nickm at torproject.org]

commit 8bd3c1b74df450d2bf4d1069c975c8babe5b770e
Merge: ad38204 7955821
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 27 08:13:37 2017 -0500

    Merge branch 'feature17975'

 changes/change_separate_exit_and_relay.txt |   2 +
 doc/tor.1.txt                              |  14 ++++
 src/config/torrc.sample.in                 |   7 +-
 src/or/config.c                            | 107 ++++++++++++++++++-----------
 src/or/connection.c                        |  68 ++++++++++++++----
 src/or/or.h                                |  18 +++--
 src/or/policies.c                          |  28 ++++----
 src/test/test_policy.c                     |   8 ++-
 8 files changed, 178 insertions(+), 74 deletions(-)