Merge branch 'tor-github/pr/1912' into maint-0.3.5
commit6a43aadecc5ab8564e71da2f00483eb63df13ae0
authorDavid Goulet <dgoulet@torproject.org>
Fri, 12 Jun 2020 16:55:17 +0000 (12 12:55 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Fri, 12 Jun 2020 16:55:17 +0000 (12 12:55 -0400)
tree61ac2e07b6d6cf69647cfac5776f267e829f74df
parentc1add51bcc49c299391e662603b590699031496c
parentf49f1d6fb28d338e0e371ee915a72b85251d239d
Merge branch 'tor-github/pr/1912' into maint-0.3.5