Merge branch 'maint-0.2.9' into maint-0.3.2
commit2b1b8bf2cad4af304d38f88e38047dadddd7e0be
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Sep 2018 13:56:19 +0000 (5 09:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Sep 2018 13:56:19 +0000 (5 09:56 -0400)
treef0348ca9d0710558f62e493a8c49a99295598866
parentb40f9967fa31faa1dcf1a977989e235fbe836015
parent4e4b6a247661f1ad78de6b07cee3de5bf2a96aa1
Merge branch 'maint-0.2.9' into maint-0.3.2
.travis.yml