Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0
commit5ec65be8bff9862d31f612bdd28c0b0d78b1f5cf
authorRoger Dingledine <arma@torproject.org>
Wed, 20 Feb 2019 15:39:28 +0000 (20 10:39 -0500)
committerRoger Dingledine <arma@torproject.org>
Wed, 20 Feb 2019 15:39:28 +0000 (20 10:39 -0500)
tree6527d9d8e50c3c48fbb0fd7e7545e84c92df429a
parentccab4347e592116fcbc0faa42dcfaf7eaa6fe715
parentd32e4079761f0076cd9e704a7f9996aa5b599f60
Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0