]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/ticket19998'
authorNick Mathewson <nickm@torproject.org>
Tue, 13 Sep 2016 12:54:43 +0000 (08:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 13 Sep 2016 12:54:43 +0000 (08:54 -0400)

Trivial merge