]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Thu, 13 Aug 2020 18:20:27 +0000 (14:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 13 Aug 2020 18:20:27 +0000 (14:20 -0400)

Trivial merge