Merge branch 'maint-0.2.8' into release-0.2.8

This commit is contained in:
Nick Mathewson 2016-05-23 11:06:22 -04:00
commit 0f80dd2a26
1 changed files with 0 additions and 3 deletions

3
.gitignore vendored
View File

@ -189,9 +189,6 @@ uptime-*.json
/src/test/test-memwipe.exe
/src/test/test-switch-id.exe
/src/test/test_workqueue.exe
/src/test/test_zero_length_keys.sh
/src/test/test_ntor.sh
/src/test/test_bt.sh
# /src/tools/
/src/tools/tor-checkkey