Merge branch 'bug27968_squashed' into maint-0.3.5
commit996f24fcd31be197b8cfc9cb5dddd2b04a4cf3a2
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2018 17:14:32 +0000 (2 13:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Nov 2018 17:14:32 +0000 (2 13:14 -0400)
tree75badcccc74c209ab7259c0fa1360bb4bc983e2b
parent0ea508ec6f540f0c768d993df257a9733fac4074
parente36e4a9671e2dc066fbc0f51c845a9941414b08f
Merge branch 'bug27968_squashed' into maint-0.3.5