Merge branch 'maint-0.2.9' into maint-0.3.1
commit1aa0ae2cc3547a35a44967ed56c1f78a42c076f8
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)
tree4b26742f4eafef4f6a6993b3974ded2a655418fe
parent0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa
parent3370b3cfef62cba8377285d95b232f810edde504
Merge branch 'maint-0.2.9' into maint-0.3.1
.travis.yml