Merge branch 'tor-github/pr/1047'
commitff9aa32143849c69097000290b939f14c9bbcb36
authorDavid Goulet <dgoulet@torproject.org>
Tue, 28 May 2019 18:59:07 +0000 (28 14:59 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 28 May 2019 18:59:07 +0000 (28 14:59 -0400)
tree378b8968346301e4a6cf5442dadcc3a14eed1777
parent0a86f14addd031ac69647f4ab6fc66c1835cd31e
parent6d9e47702fe52b0817a593117a7f4a3eecf06ad7
Merge branch 'tor-github/pr/1047'