From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 30 Apr 2014 14:58:18 +0000 (-0400)
Subject: Update .gitignore for doc, contrib changes
X-Git-Tag: tor-0.2.5.5-alpha~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87e16087b74d1348a1500a24cce238a2463822dc;p=thirdparty%2Ftor.git

Update .gitignore for doc, contrib changes

In doc, restoring torify made us generate some .in files we didn't
before.

In contrib, we added tor.service.in, but didn't add tor.service to .gitignore
---

diff --git a/.gitignore b/.gitignore
index 71737cf1ba..efee905550 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,7 @@
 # /contrib/
 /contrib/dist/tor.sh
 /contrib/dist/torctl
+/contrib/dist/tor.service
 /contrib/operator-tools/tor.logrotate
 /contrib/dist/suse/tor.sh
 
@@ -101,7 +102,9 @@
 /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/