From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 Apr 2014 17:41:07 +0000 (-0400)
Subject: Forward-port bug9665 fix to work with our fix for 11069
X-Git-Tag: tor-0.2.5.4-alpha~71^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=754a50592c412d95d2eb48038784d0ef725a7dc2;p=thirdparty%2Ftor.git

Forward-port bug9665 fix to work with our fix for 11069
---

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index ba3ac00f04..01ff4dca07 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 "