]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket21799' into maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Sun, 26 Mar 2017 10:28:58 +0000 (12:28 +0200)
committerNick Mathewson <nickm@torproject.org>
Sun, 26 Mar 2017 10:28:58 +0000 (12:28 +0200)

Trivial merge