Merge remote-tracking branch 'tor-github/pr/314'
commita7d0cbd4626a75e9b90ae50a042e59a7034949af
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Sep 2018 16:19:13 +0000 (11 12:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Sep 2018 16:19:13 +0000 (11 12:19 -0400)
tree19fbb50027e1d4389fe3a472fa07377c11758a87
parentf741505642773ac8733dffe06365c532f5a92ee0
parent1ec54b3556ff24d3cfee72bebba48be90243fb2d
Merge remote-tracking branch 'tor-github/pr/314'