]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug23827-v2'
authorNick Mathewson <nickm@torproject.org>
Tue, 12 Dec 2017 14:27:03 +0000 (09:27 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 Dec 2017 14:27:03 +0000 (09:27 -0500)

Trivial merge