Merge branch 'maint-0.2.5' into maint-0.2.9
commit3370b3cfef62cba8377285d95b232f810edde504
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Mar 2018 09:42:43 +0000 (19 05:42 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Mar 2018 09:42:43 +0000 (19 05:42 -0400)
tree38ed21177b48b883a47ed3b412fa16df62fd1556
parent67a313f0ecc281dd73004eaa810b17e3cdcc3a24
parent0eb2cdf99de77556fce549ba856887d5852a034b
Merge branch 'maint-0.2.5' into maint-0.2.9
.travis.yml