Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0
commit6a6f7eb6718f22da80596a35e7774b075a417e97
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 20:22:52 +0000 (5 16:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 20:22:52 +0000 (5 16:22 -0400)
tree85b5b98638fbed4fcb1e5da724a55db600f17117
parentd63c17f2afb810f5db896b10909fe9ff2bfe7cf9
parent821dd54586bffd95bdd8c9d333b1f80ef55d3742
Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0