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

[nickm at torproject.org]

commit f17f7a4fdf1037a2cabe7c766231da244e30e692
Merge: f226d6460 5c5eb0f09
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:39:55 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)