Merge branch 'maint-0.4.0' into maint-0.4.1
commit5b07ff40112390518d95caa90447cd5faf938cf7
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Jun 2019 22:44:31 +0000 (10 18:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Jun 2019 22:44:31 +0000 (10 18:44 -0400)
tree62ee12436bb38fffe351e78f52e4e9bd78f69f67
parent6a72cc25983850fb23bd21adb181b38c0ead2c5a
parentc8447f95ec202bff9d99941dcdf0dca91e0edc3f
Merge branch 'maint-0.4.0' into maint-0.4.1
.travis.yml