]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 23 Oct 2017 19:53:45 +0000 (15:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 23 Oct 2017 19:53:45 +0000 (15:53 -0400)

Trivial merge