Merge remote-tracking branch 'tor-github/pr/1657'
commit5e70c27e8560ac1885ae9d9e1b79d3838b49cc09
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Jan 2020 18:10:14 +0000 (15 13:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Jan 2020 18:10:14 +0000 (15 13:10 -0500)
tree504a8f3625644d87d6883f4d9afd4c8ce809021b
parent5fa7c1b13fbefcfd9b71a1f95922cf4e92b5e141
parent73ac1add3f2af813c18b1da5f0082f6112267304
Merge remote-tracking branch 'tor-github/pr/1657'