]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9
authorteor <teor@torproject.org>
Fri, 9 Aug 2019 21:21:31 +0000 (07:21 +1000)
committerteor <teor@torproject.org>
Fri, 9 Aug 2019 21:21:31 +0000 (07:21 +1000)

Trivial merge