Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9
commit967460389a2f5dd70f75dd753a0d9ff97292e5b2
authorNick Mathewson <nickm@torproject.org>
Wed, 18 Sep 2019 01:26:17 +0000 (17 21:26 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 18 Sep 2019 01:26:17 +0000 (17 21:26 -0400)
tree03cf7a4981f127a012b0bebfba1daf8aafa366c9
parent484710f25be73d18fefa1e03339c9247e8ec7337
parent1087c48d6ef56fee25ca1d06a4aa5f311fe287ff
Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9