[tor-commits] [tor-browser-bundle/maint-5.0] Bug 17875: Discourage editing of torrc-defaults.

[gk at torproject.org]

commit 41b71527e0d64a3b14290a82c96014e663f8b93d
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Mon Dec 21 12:03:13 2015 -0500

    Bug 17875: Discourage editing of torrc-defaults.
---
 Bundle-Data/linux/Data/Tor/torrc-defaults          |    6 ++++++
 Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults |    6 ++++++
 Bundle-Data/windows/Data/Tor/torrc-defaults        |    6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults
index 4b91aae..0a87e5f 100644
--- a/Bundle-Data/linux/Data/Tor/torrc-defaults
+++ b/Bundle-Data/linux/Data/Tor/torrc-defaults
@@ -1,3 +1,9 @@
+# torrc-defaults for Tor Browser
+#
+# This file is distributed with Tor Browser and should not be modified (it
+# may be overwritten during the next Tor Browser update). To customize your
+# Tor configuration, shut down Tor Browser and edit the torrc file.
+#
 # If non-zero, try to write to disk less frequently than we would otherwise.
 AvoidDiskWrites 1
 # Where to send logging messages.  Format is minSeverity[-maxSeverity]
diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
index 4b91aae..0a87e5f 100644
--- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
+++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
@@ -1,3 +1,9 @@
+# torrc-defaults for Tor Browser
+#
+# This file is distributed with Tor Browser and should not be modified (it
+# may be overwritten during the next Tor Browser update). To customize your
+# Tor configuration, shut down Tor Browser and edit the torrc file.
+#
 # If non-zero, try to write to disk less frequently than we would otherwise.
 AvoidDiskWrites 1
 # Where to send logging messages.  Format is minSeverity[-maxSeverity]
diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults
index 4b91aae..0a87e5f 100644
--- a/Bundle-Data/windows/Data/Tor/torrc-defaults
+++ b/Bundle-Data/windows/Data/Tor/torrc-defaults
@@ -1,3 +1,9 @@
+# torrc-defaults for Tor Browser
+#
+# This file is distributed with Tor Browser and should not be modified (it
+# may be overwritten during the next Tor Browser update). To customize your
+# Tor configuration, shut down Tor Browser and edit the torrc file.
+#
 # If non-zero, try to write to disk less frequently than we would otherwise.
 AvoidDiskWrites 1
 # Where to send logging messages.  Format is minSeverity[-maxSeverity]