Merge branch 'maint-0.2.8'

diff --cc .gitignore
index 670bca5c2c461e170290006d59ace83d537ad674,f304a32ecf25dfcf84c3e2b423992064e1fa78c5..2f94254c53922b56c17faf59e7dbc3d46838bea1
--- 1/.gitignore
--- 2/.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