Merge branch 'tor-github/pr/691' into maint-0.3.5
commit1216f99534319f4739cd6b90f7aa3633191c2179
authorDavid Goulet <dgoulet@torproject.org>
Tue, 26 Feb 2019 15:46:52 +0000 (26 10:46 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 26 Feb 2019 15:46:52 +0000 (26 10:46 -0500)
treec01a3eb3d7430f657a39d40e28f0d0398437b04f
parent955ca72f956f2747809def40b99b87b5647ee8ce
parent192b312c977974680516e699c187d285f74ee8e0
Merge branch 'tor-github/pr/691' into maint-0.3.5