]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/fix-exitpolicy-leak'
authorNick Mathewson <nickm@torproject.org>
Wed, 9 Dec 2015 21:25:17 +0000 (16:25 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 9 Dec 2015 21:25:17 +0000 (16:25 -0500)
1  2 
src/or/policies.c

Simple merge