Merge branch 'maint-0.2.5' into maint-0.2.9
commit36567c5ca4a1f9800415c772c87ee17dfba8d75d
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 15:16:47 +0000 (19 10:16 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Jan 2018 15:16:47 +0000 (19 10:16 -0500)
tree3ecc8bf09eaba64da73e9be2f9ea395d63bb40fa
parent9464da210d3214fc094f5fc3b2c229470dbea59c
parent49de586add6394c7a04c9a982fbe66b185cf4e58
Merge branch 'maint-0.2.5' into maint-0.2.9
.travis.yml