summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-02 19:10:42 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-02 19:14:30 -0400
commit8a79b56ac6709dfddaa15d9c76d0f856a502a6a1 (patch)
tree36e96d625b6f62a386b3331d51df369138a7b923 /.gitignore
parentd19cbf3ab17a5afcbe0e94a16686e9ff9129dbfc (diff)
downloadtor-8a79b56ac6709dfddaa15d9c76d0f856a502a6a1.tar.gz
tor-8a79b56ac6709dfddaa15d9c76d0f856a502a6a1.zip
Divide torrc.sample into torrc.sample and torrc.minimal
torrc.minimal is now the one that should change as infrequently as possible. To schedule an change to go into it eventually, make your change to torrc.minimal.in-sample. torrc.sample is now the volatile one: we can change it to our hearts' content. Closes ticket #11144
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index de1eb04694..e45ebcfe2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,6 +133,7 @@
/src/config/sample-server-torrc
/src/config/torrc
/src/config/torrc.sample
+/src/config/torrc.minimal
# /src/or/
/src/or/Makefile