Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0
commit5c87add923d14c90db8c84cca843754e7715df9e
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:21:51 +0000 (19 11:21 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:21:51 +0000 (19 11:21 -0500)
tree50434c24c2f60c88f73c73ccd77e952911aa65ad
parent94f7e53d0416d80bacc5e2cf86e97ab07cfb09f2
parentf5a6d4c6ea78e73e8f27292fac6d4153e8e84aa0
Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0