[tor-commits] [chutney/master] Merge remote-tracking branch 'teor/clarify-exit-policies'

[nickm at torproject.org]

commit e647bffb7a5598147c2121d0f2a35702efd1d5f6
Merge: 984f672 0c85da6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 17 10:38:33 2016 -0400

    Merge remote-tracking branch 'teor/clarify-exit-policies'

 torrc_templates/exit-v4.i | 26 ++++++++++++++++++++------
 torrc_templates/exit-v6.i | 31 +++++++++++++++++--------------
 2 files changed, 37 insertions(+), 20 deletions(-)