Merge branch 'ticket31311_041' into maint-0.4.1
commit21531f35f3c6d7d7a86f474e5a2a4ff02388bea0
authorNick Mathewson <nickm@torproject.org>
Tue, 6 Aug 2019 13:19:05 +0000 (6 09:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 6 Aug 2019 13:19:05 +0000 (6 09:19 -0400)
treed46845fc308bb2ec180c6d1ed461318d57cc45eb
parent74c059596527af67f5df38847e86179852bc7005
parent394528241947800a0ac881b8890e5af387e0e9d7
Merge branch 'ticket31311_041' into maint-0.4.1