]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9
authorteor <teor@torproject.org>
Wed, 13 Mar 2019 20:35:05 +0000 (06:35 +1000)
committerteor <teor@torproject.org>
Wed, 13 Mar 2019 20:35:05 +0000 (06:35 +1000)

Trivial merge