Merge remote-tracking branch 'tor-github/pr/1033'
commitb2b779228d46334a03e62f0e07c2300adce5e0b3
authorNick Mathewson <nickm@torproject.org>
Fri, 17 May 2019 12:18:20 +0000 (17 08:18 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 17 May 2019 12:18:20 +0000 (17 08:18 -0400)
treef6987fd0f18245de5eccaf5deda65c483451d109
parent9cec7a7b5c6a947642ae81942f68e96fa403fc9f
parent84274000d8a12a62ced9ef95d1bf355e7ab6e5c6
Merge remote-tracking branch 'tor-github/pr/1033'