]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Aug 2019 15:11:32 +0000 (11:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Aug 2019 15:11:32 +0000 (11:11 -0400)

Trivial merge