Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0
commitde5ab1ef49559ed24b639bbf052ea584db2f2b77
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Mar 2019 13:32:05 +0000 (19 09:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Mar 2019 13:32:05 +0000 (19 09:32 -0400)
tree826b236d17d613a5b9d3b8609387c57e043aeeef
parentb4483edce03be334ac320b812bfeae3bc2d5ee6b
parentaf21d126e6b138c6f986f02c33c8c38d9bcd537f
Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0