]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug28245_029' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Fri, 9 Nov 2018 15:49:43 +0000 (10:49 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 9 Nov 2018 15:49:43 +0000 (10:49 -0500)

Trivial merge