1 files changed, 13 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index e48918d32..71737cf1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
 *.bak
 # Python droppings
 *.pyc
+*.pyo
 
 # /
 /Makefile
@@ -60,20 +61,10 @@
 /tor-*-win32.exe
 
 # /contrib/
-/contrib/Makefile
-/contrib/Makefile.in
-/contrib/tor.sh
-/contrib/torctl
-/contrib/torify
-/contrib/*.pyc
-/contrib/*.pyo
-/contrib/tor.logrotate
-/contrib/tor.wxs
-
-# /contrib/suse/
-/contrib/suse/tor.sh
-/contrib/suse/Makefile.in
-/contrib/suse/Makefile
+/contrib/dist/tor.sh
+/contrib/dist/torctl
+/contrib/operator-tools/tor.logrotate
+/contrib/dist/suse/tor.sh
 
 # /debian/
 /debian/files
@@ -110,9 +101,7 @@
 /doc/tor-resolve.html.in
 /doc/tor-resolve.1.xml
 /doc/torify.1
-/doc/torify.1.in
 /doc/torify.html
-/doc/torify.html.in
 /doc/torify.1.xml
 
 # /doc/spec/
@@ -128,10 +117,13 @@
 /src/common/Makefile.in
 /src/common/common_sha1.i
 /src/common/libor.a
+/src/common/libor-testing.a
 /src/common/libor.lib
 /src/common/libor-crypto.a
+/src/common/libor-crypto-testing.a
 /src/common/libor-crypto.lib
 /src/common/libor-event.a
+/src/common/libor-event-testing.a
 /src/common/libor-event.lib
 /src/common/libcurve25519_donna.a
 /src/common/libcurve25519_donna.lib
@@ -149,7 +141,10 @@
 /src/or/or_sha1.i
 /src/or/tor
 /src/or/tor.exe
+/src/or/tor-cov
+/src/or/tor-cov.exe
 /src/or/libtor.a
+/src/or/libtor-testing.a
 /src/or/libtor.lib
 
 # /src/test
@@ -158,9 +153,11 @@
 /src/test/bench
 /src/test/bench.exe
 /src/test/test
+/src/test/test-bt-cl
 /src/test/test-child
 /src/test/test-ntor-cl
 /src/test/test.exe
+/src/test/test-bt-cl.exe
 /src/test/test-child.exe
 /src/test/test-ntor-cl.exe