Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0
commit6d188fb4cc026668502c0fb28e9bffaa098f84dc
authorteor <teor@torproject.org>
Wed, 27 Mar 2019 02:31:07 +0000 (27 12:31 +1000)
committerteor <teor@torproject.org>
Wed, 27 Mar 2019 02:31:07 +0000 (27 12:31 +1000)
tree8afea61da199d0eef853cd772a04d98add4480f7
parentca29cb397b619252a3d07d6f371313f10d8fb23f
parent4be522b2e6eb634b141d7876234acf40a931cab6
Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0