Merge branch 'maint-0.2.2' into release-0.2.2

3 files changed, 14 insertions, 8 deletions

diff --git a/changes/bug3536 b/changes/bug3536
new file mode 100644
index 0000000000..d3cec131ba
--- /dev/null
+++ b/changes/bug3536
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Send a SUCCEEDED stream event to the controller when a reverse
+      resolve succeeded. Fixes bug 3536; bugfix on 0.0.8pre1. Issue
+      discovered by katmagic.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 1815a8d963..8f80c9fde6 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -509,14 +509,14 @@ The following options are useful only for clients (that is, if
     patterns of nodes to avoid when building a circuit.
     (Example:
     ExcludeNodes SlowServer, $    EFFFFFFFFFFFFFFF, \{cc}, 255.254.0.0/8) +
-+
+ +
     By default, this option is treated as a preference that Tor is allowed
     to override in order to keep working.
     For example, if you try to connect to a hidden service,
     but you have excluded all of the hidden service's introduction points,
     Tor will connect to one of them anyway.  If you do not want this
     behavior, set the StrictNodes option (documented below).  +
-+
+ +
     Note also that if you are a relay, this (and the other node selection
     options below) only affects your own circuits that Tor builds for you.
     Clients can still build circuits through you to any node.  Controllers
@@ -535,22 +535,22 @@ The following options are useful only for clients (that is, if
     A list of identity fingerprints, nicknames, country codes and address
     patterns of nodes to use as exit node---that is, a
     node that delivers traffic for you outside the Tor network. +
-+
+ +
     Note that if you list too few nodes here, or if you exclude too many exit
     nodes with ExcludeExitNodes, you can degrade functionality.  For example,
     if none of the exits you list allows traffic on port 80 or 443, you won't
     be able to browse the web. +
-+
+ +
     Note also that not every circuit is used to deliver traffic outside of
     the Tor network.  It is normal to see non-exit circuits (such as those
     used to connect to hidden services, those that do directory fetches,
     those used for relay reachability self-tests, and so on) that end
     at a non-exit node.  To
     keep a node from being used entirely, see ExcludeNodes and StrictNodes. +
-+
+ +
     The ExcludeNodes option overrides this option: any node listed in both
     ExitNodes and ExcludeNodes is treated as excluded. +
-+
+ +
     The .exit address notation, if enabled via AllowDotExit, overrides
     this option.
 
@@ -561,7 +561,7 @@ The following options are useful only for clients (that is, if
     circuits except for direct connections to directory servers.  The Bridge
     option overrides this option; if you have configured bridges and
     UseBridges is 1, the Bridges are used as your entry nodes. +
-+
+ +
     The ExcludeNodes option overrides this option: any node listed in both
     EntryNodes and ExcludeNodes is treated as excluded.
 
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 78b1b92de9..d4d7e1c73c 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -2611,7 +2611,8 @@ connection_ap_handshake_socks_resolved(edge_connection_t *conn,
   }
   connection_ap_handshake_socks_reply(conn, buf, replylen,
           (answer_type == RESOLVED_TYPE_IPV4 ||
-           answer_type == RESOLVED_TYPE_IPV6) ?
+           answer_type == RESOLVED_TYPE_IPV6 ||
+           answer_type == RESOLVED_TYPE_HOSTNAME) ?
                                       0 : END_STREAM_REASON_RESOLVEFAILED);
 }