]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug28348_035' into bug28348_036
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Nov 2018 12:43:27 +0000 (07:43 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Nov 2018 12:43:27 +0000 (07:43 -0500)

Trivial merge