Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
commitdc19d65c3bd02e4b406388939a9f57bac8010c2c
authorNick Mathewson <nickm@torproject.org>
Thu, 28 Feb 2019 16:20:26 +0000 (28 11:20 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 28 Feb 2019 16:20:26 +0000 (28 11:20 -0500)
tree38ac7b28e0e96caa308ad0b8f0bf56a917a25462
parentaef6e61347f45087305871f356891ddd959d7081
parentaa360b255bc1c262486500655bac70c4f0f00118
Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0