summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-03-30 00:01:03 +0000
committerRoger Dingledine <arma@torproject.org>2004-03-30 00:01:03 +0000
commitce200ae133f1700e749c28454f572dbf7e8778ab (patch)
tree4d7b895f1d5999d8f0e9c57546a778de1017f6b9
parentd8a5358ce9862e17e5c22d77bc6dbc2ad71c03d1 (diff)
downloadtor-ce200ae133f1700e749c28454f572dbf7e8778ab.tar.gz
tor-ce200ae133f1700e749c28454f572dbf7e8778ab.zip
rename torrc to torrc.sample
now by default no torrc will be installed, so we'll just use the built-in defaults (we already do this on windows) svn:r1375
-rw-r--r--src/config/Makefile.am2
-rw-r--r--src/config/torrc.sample.in (renamed from src/config/torrc.in)0
2 files changed, 1 insertions, 1 deletions
diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 86a192b9b5..13ed39d7fa 100644
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -2,4 +2,4 @@ confdir = $(sysconfdir)/tor
EXTRA_DIST = dirservers
-conf_DATA = dirservers torrc
+conf_DATA = dirservers torrc.sample
diff --git a/src/config/torrc.in b/src/config/torrc.sample.in
index 34c27d409f..34c27d409f 100644
--- a/src/config/torrc.in
+++ b/src/config/torrc.sample.in