aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendcommon.c
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2016-09-13 17:20:46 +1000
committerNick Mathewson <nickm@torproject.org>2016-09-13 10:13:57 -0400
commit365ca3ca0f5d9d391a2156436d1a7c620906e23a (patch)
treec1eb1da017298f74ce242a5fd63833bc91128d03 /src/or/rendcommon.c
parentf686fa2ee600f6670bab7531d404eaf5f8ea91ff (diff)
downloadtor-365ca3ca0f5d9d391a2156436d1a7c620906e23a.tar.gz
tor-365ca3ca0f5d9d391a2156436d1a7c620906e23a.zip
Refactor Single Onion code to improve consistency
* Check consistency between the two single onion torrc options * Use the more relevant option each time we check for single onion mode * Clarify log messages * Clarify comments * Otherwise, no behaviour change
Diffstat (limited to 'src/or/rendcommon.c')
-rw-r--r--src/or/rendcommon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 12dd0f44e5..083efd0276 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1097,11 +1097,11 @@ rend_non_anonymous_mode_enabled(const or_options_t *options)
/* Make sure that tor only builds one-hop circuits when they would not
* compromise user anonymity.
*
- * One-hop circuits are permitted in Tor2webMode or OnionServiceSingleHopMode.
+ * One-hop circuits are permitted in Tor2web or Single Onion modes.
*
- * Tor2webMode and OnionServiceSingleHopMode are also allowed to make
- * multi-hop circuits. For example, single onion HSDir circuits are 3-hop to
- * prevent denial of service.
+ * Tor2web or Single Onion modes are also allowed to make multi-hop circuits.
+ * For example, single onion HSDir circuits are 3-hop to prevent denial of
+ * service.
*/
void
assert_circ_anonymity_ok(origin_circuit_t *circ,