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