Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1
commit4c8af10f0ea1a7f634806e6870d4c93b947ecb13
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:08:46 +0000 (22 12:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:08:46 +0000 (22 12:08 -0400)
tree59acc0e6f23dafefe112cfe0f95bf3b04814bf13
parent2318bb237fa9ce908efdb0cf89dbeaffe3871939
parent2b825a1a2e6e79fa71b0e038241d2107aaf30d4b
Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1