Merge remote-tracking branch 'tor-github/pr/875'
commit965f0d891232f3ece13f8310c9c01f71ec55f25d
authorteor <teor@torproject.org>
Tue, 2 Apr 2019 01:47:05 +0000 (2 11:47 +1000)
committerteor <teor@torproject.org>
Tue, 2 Apr 2019 01:47:05 +0000 (2 11:47 +1000)
treeb4afb36ad3e47f8afb9058cd553ae10d02858c93
parent583ed7c6ecde0c95184586d581f2cb1ac78e8c39
parent809a3a748d5f0cbaa0357ec63388ed291fb7b0bd
Merge remote-tracking branch 'tor-github/pr/875'