Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5
commit41d52e9cd80bfb318ec7f0969f3889d275012e37
authorteor <teor@torproject.org>
Wed, 29 Jan 2020 21:53:53 +0000 (30 07:53 +1000)
committerteor <teor@torproject.org>
Wed, 29 Jan 2020 21:53:53 +0000 (30 07:53 +1000)
treed5f59ce2835e6f3ee3a9849ddbc2175deab9e920
parent19954cffd7710ccac778aa5cf15ae1bc6a5d56fa
parent0d64bafcfedd259fb15b3ee85a7b00a840aec73b
Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5