]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'isis/bug22907'
authorNick Mathewson <nickm@torproject.org>
Mon, 4 Dec 2017 19:12:03 +0000 (14:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 4 Dec 2017 19:12:03 +0000 (14:12 -0500)

Trivial merge