]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'getinfo-private-exitpolicy-v4-squashed'
authorNick Mathewson <nickm@torproject.org>
Fri, 20 Nov 2015 15:48:28 +0000 (10:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 20 Nov 2015 15:48:28 +0000 (10:48 -0500)

Trivial merge