aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-07 13:41:07 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-07 13:41:07 -0400
commit754a50592c412d95d2eb48038784d0ef725a7dc2 (patch)
treeac3e5371deae7b7e45bc7361fd804b671b459017 /src/or
parent08ae53e400ff6fa2d8147aad440c38173c106cae (diff)
downloadtor-754a50592c412d95d2eb48038784d0ef725a7dc2.tar
tor-754a50592c412d95d2eb48038784d0ef725a7dc2.tar.gz
Forward-port bug9665 fix to work with our fix for 11069
Diffstat (limited to 'src/or')
-rw-r--r--src/or/connection_or.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index ba3ac00f0..01ff4dca0 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 "