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

[nickm at torproject.org]

commit a2d70331954aed82b08419191c200e3630be2305
Merge: 4557f3f90 1c5a76f0c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 26 15:39:56 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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