]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug17632-no-ipv4-no-localhost'
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Nov 2015 20:02:45 +0000 (15:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Nov 2015 20:02:45 +0000 (15:02 -0500)

Trivial merge