]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug28413_029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Tue, 13 Nov 2018 13:26:51 +0000 (08:26 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 13 Nov 2018 13:26:51 +0000 (08:26 -0500)

Trivial merge