diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-08-18 13:48:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-18 13:48:39 -0400 |
| commit | 8c528bc320f234f6e19f64511fcb21ab374dee7c (patch) | |
| tree | edb6f56714415c1517542067265013da838fbf8a /src/or | |
| parent | a509dbba504f7b5e2c1d93bad25e500493b06fb5 (diff) | |
| parent | 78e4aa63fbc8b65ebf94234300b0d21e573ebe6e (diff) | |
| download | tor-8c528bc320f234f6e19f64511fcb21ab374dee7c.tar tor-8c528bc320f234f6e19f64511fcb21ab374dee7c.tar.gz | |
Merge commit 'origin/maint-0.2.1'
Conflicts:
src/or/reasons.c
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/reasons.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/or/reasons.c b/src/or/reasons.c index 8bce3625d..db0f2e934 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -169,7 +169,13 @@ errno_to_stream_end_reason(int e) S_CASE(ENETUNREACH): return END_STREAM_REASON_INTERNAL; E_CASE(EHOSTUNREACH): - return END_STREAM_REASON_NOROUTE; + /* XXXX022 + * The correct behavior is END_STREAM_REASON_NOROUTE, but older + * clients don't recognize it. So we're going to continue sending + * "MISC" until 0.2.1.27 or later is "well established". + */ + /* return END_STREAM_REASON_NOROUTE; */ + return END_STREAM_REASON_MISC; S_CASE(ECONNREFUSED): return END_STREAM_REASON_CONNECTREFUSED; S_CASE(ECONNRESET): |