From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 23 May 2016 15:06:32 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b7d4b0ceaf4ed3a3e9476cbae0defb9b2e13dea;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

5b7d4b0ceaf4ed3a3e9476cbae0defb9b2e13dea
diff --cc .gitignore
index 670bca5c2c,f304a32ecf..2f94254c53
--- 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