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

[nickm at torproject.org]

commit 9a767f00be31985ed877e6086994e8405ec57356
Merge: 685232fe1 ff1486385
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 5 10:15:00 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml      | 2 +-
 changes/bug27418 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)