Merge remote-tracking branch 'tor-github/pr/279'
commit82d758afa80724f4b8322e002d351c8e7923062a
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Aug 2018 19:24:30 +0000 (28 15:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Aug 2018 19:24:30 +0000 (28 15:24 -0400)
treee61cb0cb0632fc8fc65c88b4c5c3d9d844b29b7e
parent3b960df4f9990355fc2514689280731c31551a4a
parent29d62987da525dabac7e837ee5c93c2aa839440a
Merge remote-tracking branch 'tor-github/pr/279'