]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 13 Nov 2017 16:17:58 +0000 (11:17 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 13 Nov 2017 16:17:58 +0000 (11:17 -0500)

Trivial merge