From: Karsten Loesing <karsten.loesing@gmx.net>
Date: Sat, 25 May 2013 05:33:37 +0000 (+0200)
Subject: Try harder to document default_options correctly.
X-Git-Tag: tor-0.2.5.1-alpha~173^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3795f6a78b84ffcbe9bf464d5e569ae3c718d03e;p=thirdparty%2Ftor.git

Try harder to document default_options correctly.
---

diff --git a/src/or/config.c b/src/or/config.c
index d85ba4c2e5..bb596752ec 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2315,11 +2315,11 @@ compute_publishserverdescriptor(or_options_t *options)
  * */
 #define RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT (10)
 
-/** Return 0 if every setting in <b>options</b> is reasonable, does not
- * differ from <b>default_options</b> unless in testing Tor networks, and
- * is a permissible transition from <b>old_options</b>. Else return -1.
- * Should have no side effects, except for normalizing the contents of
- * <b>options</b>.
+/** Return 0 if every setting in <b>options</b> is reasonable, is a
+ * permissible transition from <b>old_options</b>, and none of the
+ * testing-only settings differ from <b>default_options</b> unless in
+ * testing mode.  Else return -1.  Should have no side effects, except for
+ * normalizing the contents of <b>options</b>.
  *
  * On error, tor_strdup an error explanation into *<b>msg</b>.
  *