]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Mon, 23 Oct 2017 12:53:14 +0000 (08:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 23 Oct 2017 12:53:14 +0000 (08:53 -0400)

Trivial merge