aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorKarsten Loesing <karsten.loesing@gmx.net>2013-05-25 07:33:37 +0200
committerKarsten Loesing <karsten.loesing@gmx.net>2013-05-25 07:33:37 +0200
commit3795f6a78b84ffcbe9bf464d5e569ae3c718d03e (patch)
treeec5d97be67e175a054e700b8bde81d9d8d938cc0 /src/or/config.c
parentb0d4ca4990d50f45a4e0e2805ff471f7408c3007 (diff)
downloadtor-3795f6a78b84ffcbe9bf464d5e569ae3c718d03e.tar.gz
tor-3795f6a78b84ffcbe9bf464d5e569ae3c718d03e.zip
Try harder to document default_options correctly.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c10
1 files changed, 5 insertions, 5 deletions
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>.
*