[or-cvs] [tor/release-0.2.2 115/162] warn more about AllowSingleHopExits

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Tue, 16 Nov 2010 00:13:25 -0500
Subject: warn more about AllowSingleHopExits
Commit: a08a7e0fc69e68517d6aabac52c1b814994ca560

---
 ChangeLog       |    2 ++
 src/or/config.c |    7 +++++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7f5e57a..dc96101 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,8 @@ Changes in version 0.2.2.18-alpha - 2010-11-16
       DHT. Implements ticket 2088.
     - Rate-limit the "your application is giving Tor only an IP address"
       warning. Addresses bug 2000; bugfix on 0.0.8pre2.
+    - When you set AllowSingleHopExits, print a warning to explain why
+      most clients are avoiding your relay.
     - Update to the November 1 2010 Maxmind GeoLite Country database.
 
   o Code simplifications and refactoring:
diff --git a/src/or/config.c b/src/or/config.c
index ebf4031..e3d5e60 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3626,6 +3626,13 @@ options_validate(or_options_t *old_options, or_options_t *options,
            "a non-default set of DirServers.");
   }
 
+  if (options->AllowSingleHopExits && !options->DirServers) {
+    COMPLAIN("You have set AllowSingleHopExits; now your relay will allow "
+             "others to make one-hop exits. However, since by default most "
+             "clients avoid relays that set this option, most clients will "
+             "ignore you.");
+  }
+
   /*XXXX022 checking for defaults manually like this is a bit fragile.*/
 
   /* Keep changes to hard-coded values synchronous to man page and default
-- 
1.7.1