summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-06-05 10:12:00 -0400
committerNick Mathewson <nickm@torproject.org>2020-06-05 10:12:00 -0400
commitf548f1475bee7d85629be4411e09d05836eba942 (patch)
treefc9df5e48f5acd9c0363f130c6b2a909fb96944b
parent1fb9be53969011a10c453a36099583f631dc8a09 (diff)
parent5ba7d494c5618a1bd546902db1a49479b7b55b86 (diff)
downloadtor-f548f1475bee7d85629be4411e09d05836eba942.tar.gz
tor-f548f1475bee7d85629be4411e09d05836eba942.zip
Merge remote-tracking branch 'tor-github/pr/1920/head'
-rw-r--r--.gitignore2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index ea6b68ec5f..97b145590e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,11 +79,9 @@ uptime-*.json
/callgraph/
# /contrib/
-/contrib/dist/tor.sh
/contrib/dist/torctl
/contrib/dist/tor.service
/contrib/operator-tools/tor.logrotate
-/contrib/dist/suse/tor.sh
# /debian/
/debian/files