commit 5b7d4b0ceaf4ed3a3e9476cbae0defb9b2e13dea Merge: b53a205 87134db Author: Nick Mathewson nickm@torproject.org Date: Mon May 23 11:06:32 2016 -0400

Merge branch 'maint-0.2.8'

.gitignore | 3 --- 1 file changed, 3 deletions(-)

diff --cc .gitignore index 670bca5,f304a32..2f94254 --- a/.gitignore +++ b/.gitignore @@@ -192,11 -188,7 +192,8 @@@ uptime-*.jso /src/test/test-ntor-cl.exe /src/test/test-memwipe.exe /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