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

commit 1c5a76f0ceeb0e704a52e1f0fd421790b90bebe6 Merge: ebb0ac338 7021d33b9 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 26 15:39:56 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)