Merge remote-tracking branch 'tor-github/pr/1512'
commit10982d59973a33da0d8a553b0d1ee6d1cb8d5a2c
authorteor <teor@torproject.org>
Thu, 7 Nov 2019 00:35:50 +0000 (7 10:35 +1000)
committerteor <teor@torproject.org>
Thu, 7 Nov 2019 00:35:50 +0000 (7 10:35 +1000)
tree43c4fc72af480d9580a5f93d5f4deb09ac472836
parentaebde73629d3df191beccd8afd794a8f05d3dfa5
parent1ee17dc07a4033546b5b4cfaedc3ace902ac8b20
Merge remote-tracking branch 'tor-github/pr/1512'