Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0
commit2300a619a548ed529551c731dd706fea0b2a0a20
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 20:13:53 +0000 (5 16:13 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jun 2019 20:13:53 +0000 (5 16:13 -0400)
treed5694d522b70479e2f79f07bf6db05d445e2f37c
parent851e881f01355b0290e79100c09dbedd425f8946
parent245dccb77d79dc432bb7aab21ce2c893da4b602a
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0