1 files changed, 35 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 46917c311f..673bb7871d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,16 +63,6 @@
 /contrib/tor.logrotate
 /contrib/tor.wxs
 
-# /contrib/osx/
-/contrib/osx/Makefile
-/contrib/osx/Makefile.in
-/contrib/osx/TorBundleDesc.plist
-/contrib/osx/TorBundleInfo.plist
-/contrib/osx/TorDesc.plist
-/contrib/osx/TorInfo.plist
-/contrib/osx/TorStartupDesc.plist
-/contrib/osx/net.freehaven.tor.plist
-
 # /contrib/suse/
 /contrib/suse/tor.sh
 /contrib/suse/Makefile.in
@@ -80,6 +70,7 @@
 
 # /debian/
 /debian/files
+/debian/micro-revision.i
 /debian/patched
 /debian/tor
 /debian/tor.postinst.debhelper
@@ -90,12 +81,27 @@
 # /doc/
 /doc/Makefile
 /doc/Makefile.in
-/doc/tor.1
 /doc/doxygen
-
-# /doc/design-paper/
-/doc/design-paper/Makefile
-/doc/design-paper/Makefile.in
+/doc/tor.1
+/doc/tor.1.in
+/doc/tor.html
+/doc/tor.html.in
+/doc/tor.1.xml
+/doc/tor-gencert.1
+/doc/tor-gencert.1.in
+/doc/tor-gencert.html
+/doc/tor-gencert.html.in
+/doc/tor-gencert.1.xml
+/doc/tor-resolve.1
+/doc/tor-resolve.1.in
+/doc/tor-resolve.html
+/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/
 /doc/spec/Makefile
@@ -108,8 +114,10 @@
 # /src/common/
 /src/common/Makefile
 /src/common/Makefile.in
+/src/common/common_sha1.i
 /src/common/libor.a
 /src/common/libor-crypto.a
+/src/common/libor-event.a
 
 # /src/config/
 /src/config/Makefile
@@ -121,14 +129,25 @@
 # /src/or/
 /src/or/Makefile
 /src/or/Makefile.in
+/src/or/or_sha1.i
 /src/or/micro-revision.*
 /src/or/tor
-/src/or/test
+/src/or/tor.exe
+/src/or/libtor.a
+
+# /src/test
+/src/test/Makefile
+/src/test/Makefile.in
+/src/test/test
+
 
 # /src/tools/
 /src/tools/tor-checkkey
 /src/tools/tor-resolve
 /src/tools/tor-gencert
+/src/tools/tor-checkkey.exe
+/src/tools/tor-resolve.exe
+/src/tools/tor-gencert.exe
 /src/tools/Makefile
 /src/tools/Makefile.in