[tor-commits] [tor/master] Forward-port bug9665 fix to work with our fix for 11069

[nickm@xxxxxxxxxxxxxx]

commit 754a50592c412d95d2eb48038784d0ef725a7dc2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Apr 7 13:41:07 2014 -0400

    Forward-port bug9665 fix to work with our fix for 11069
---
 src/or/connection_or.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index ba3ac00..01ff4dc 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1198,7 +1198,8 @@ connection_or_connect(const tor_addr_t *_addr, uint16_t port,
 
       control_event_bootstrap_problem(
                                 "Can't connect to bridge",
-                                END_OR_CONN_REASON_NO_ROUTE);
+                                END_OR_CONN_REASON_NO_ROUTE,
+                                conn);
 
     } else {
       log_warn(LD_GENERAL, "Tried to connect to '%s' through a proxy, but "



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits