Merge branch 'maint-0.3.1'

This commit is contained in:
Nick Mathewson 2017-09-19 13:08:59 -04:00
commit 7fcae5bffa

1
.gitignore vendored
View File

@ -178,6 +178,7 @@ uptime-*.json
/src/rust/.cargo/config /src/rust/.cargo/config
/src/rust/.cargo/registry /src/rust/.cargo/registry
/src/rust/target /src/rust/target
/src/rust/registry
# /src/test # /src/test
/src/test/Makefile /src/test/Makefile