Merge remote-tracking branch 'tor-github/pr/402'
commit2c5c17510acf0cbd0eeb874a2f4c62203bf9392f
authorNick Mathewson <nickm@torproject.org>
Sun, 14 Oct 2018 19:20:39 +0000 (14 15:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 14 Oct 2018 19:20:39 +0000 (14 15:20 -0400)
tree70aee5ab9d7edade0c4934cfb0bde6d5b4828c59
parent67351f672450d5f13754294405243a59ddd86de9
parent36ba506508ec5406be3d8c6a3b275fba069a7edf
Merge remote-tracking branch 'tor-github/pr/402'