Merge branch 'tor-github/pr/1683'
commitaba31e2187808257b250bf469895330f273d7746
authorDavid Goulet <dgoulet@torproject.org>
Mon, 27 Jan 2020 17:04:25 +0000 (27 12:04 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 27 Jan 2020 17:04:25 +0000 (27 12:04 -0500)
tree99d496f25d6e54f5b81e61111bcabbab97d920bf
parentf10e6b723480eafa778c6f304a1fe42a3cf109b6
parentcda10a2e893da45eea7e742155682efcf66afb22
Merge branch 'tor-github/pr/1683'