Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0
commita9c84bfd358799dc2dbe805ff6db4a6ca184ef0b
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Mar 2019 13:45:31 +0000 (11 09:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Mar 2019 13:45:31 +0000 (11 09:45 -0400)
tree22777163d8470bf00f3de35fbb1b73a51200bc1a
parentc40d53ab3925638a04bd6d9088e748e0ea16cabf
parentf186f21a4efb9dafe2c29f850126d509079c0c37
Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0