Merge remote-tracking branch 'tor-github/pr/694'
commit1239e411a767e39905edbf95acc09284f161a0ea
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:31:22 +0000 (19 11:31 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:31:22 +0000 (19 11:31 -0500)
treee619d8adcf3f882f5e07753a8bca588665024e4a
parent0db0b4769c118ad8d77c8745877017144bc5805a
parentb53fee46223a425ed27f37944ac0d26569cead78
Merge remote-tracking branch 'tor-github/pr/694'