[tor-commits] [tor/master] Merge remote-tracking branch 'teor/fix-exitpolicy-leak'

[nickm at torproject.org]

commit 6102efbee227394ae53727b292a62df5368ab4c6
Merge: 631e351 bb32c29
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 9 16:25:17 2015 -0500

    Merge remote-tracking branch 'teor/fix-exitpolicy-leak'

 src/or/policies.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)