summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-06-10 00:59:39 +0000
committerRoger Dingledine <arma@torproject.org>2006-06-10 00:59:39 +0000
commit85f3608fa2a9aed7b69df3708effd8e8bef4cf5f (patch)
treef64c2c02c826e186c3ad48ad932a40a1001a0281
parentc559070b863cd2bf077836cf32dda9af9eec6166 (diff)
downloadtor-85f3608fa2a9aed7b69df3708effd8e8bef4cf5f.tar.gz
tor-85f3608fa2a9aed7b69df3708effd8e8bef4cf5f.zip
backport the better string at the top of torrc's autogenerated torrc.
svn:r6587
-rw-r--r--src/or/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 9ca86243e3..fcc8befb43 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3339,8 +3339,8 @@ validate_data_directory(or_options_t *options)
"if you edit it, comments will not be preserved"
/** This string can change; it tries to give the reader an idea
* that editing this file by hand is not a good plan. */
-#define GENERATED_FILE_COMMENT "# If you want a config file with " \
- "comments, look for torrc.orig.1 or similar"
+#define GENERATED_FILE_COMMENT "# The old torrc file was renamed " \
+ "to torrc.orig.1 or similar, and Tor will ignore it"
/** Save a configuration file for the configuration in <b>options</b>
* into the file <b>fname</b>. If the file already exists, and