Proposal 152 implementation from Josh Albrecht, with tweaks.

svn:r16983

3 files changed, 25 insertions, 1 deletions

diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt
index 2bbc014936..a010836156 100644
--- a/doc/spec/dir-spec.txt
+++ b/doc/spec/dir-spec.txt
@@ -591,6 +591,16 @@ $Id$
         with unrecognized items; the protocols line should be preceded with
         an "opt" until these Tors are obsolete.]
 
+   "allow-single-hop-exits"
+
+       [At most one.]
+
+       Present only if the router allows single-hop circuits to make exit
+       connections.  Most Tor servers do not support this: this is
+       included for specialized controllers designed to support perspective
+       access and such.
+
+
 2.2. Extra-info documents
 
    Extra-info documents consist of the following items:
diff --git a/doc/spec/proposals/152-single-hop-circuits.txt b/doc/spec/proposals/152-single-hop-circuits.txt
index bff5b1650b..7f3894c65a 100644
--- a/doc/spec/proposals/152-single-hop-circuits.txt
+++ b/doc/spec/proposals/152-single-hop-circuits.txt
@@ -4,7 +4,7 @@ Version:
 Last-Modified:
 Author: Geoff Goodell
 Created: 13-Jul-2008
-Status: Draft
+Status: Closed
 
 Overview
 
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 48f5b00b22..67eb17e2a6 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -387,6 +387,14 @@ can opt to use them in some circuit positions, though. The default is
 "middle,rendezvous", and other choices are not advised.
 .LP
 .TP
+\fBExcludeSingleHopRelays \fR\fB0\fR|\fB1\fR\fP
+This option controls whether circuits built by Tor will include relays with
+the AllowSingleHopExits flag set to true.  If ExcludeSingleHopRelays is set to
+0, these relays will be included.  Note that these relays might be at higher
+risk of being seized or observed, so they are not normally included.
+(Default: 1)
+.LP
+.TP
 \fBBridge \fR\fIIP:ORPort\fR [fingerprint]\fP
 When set along with UseBridges, instructs Tor to use the relay at
 "IP:ORPort" as a "bridge" relaying into the Tor network. If "fingerprint"
@@ -784,6 +792,12 @@ The IP address or fqdn of this server (e.g. moria.mit.edu). You can
 leave this unset, and Tor will guess your IP address.
 .LP
 .TP
+\fBAllowSingleHopExits \fR\fB0\fR|\fB1\fR\fP
+This option controls whether clients can use this server as a single hop 
+proxy.  If set to 1, clients can use this server as an exit even if it is
+the only hop in the circuit.  (Default: 0)
+.LP
+.TP
 \fBAssumeReachable \fR\fB0\fR|\fB1\fR\fP
 This option is used when bootstrapping a new Tor network. If set to 1,
 don't do self-reachability testing; just upload your server descriptor