[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit dcb6924cd5d50c39813fd46b22230497e2385439
Merge: 26df7c7f4 717507e3b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 10 17:12:34 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml         | 49 ++++++++++++++++++++++++++++---------------------
 changes/ticket27738 |  4 ++++
 2 files changed, 32 insertions(+), 21 deletions(-)