]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1118' into maint-0.4.1
authorNick Mathewson <nickm@torproject.org>
Wed, 26 Jun 2019 13:49:40 +0000 (09:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 26 Jun 2019 13:49:40 +0000 (09:49 -0400)

Trivial merge