Merge branch 'maint-0.2.8'

This commit is contained in:
Nick Mathewson 2016-05-23 11:06:32 -04:00
commit 5b7d4b0cea

3
.gitignore vendored
View File

@ -194,9 +194,6 @@ uptime-*.json
/src/test/test-switch-id.exe
/src/test/test-timers.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