[or-cvs] [tor/master 4/4] Make Sebastian's misc-reasons branch compile; frob the changes file

[nickm at torproject.org]

Author: Nick Mathewson <nickm at torproject.org>
Date: Sun, 15 Aug 2010 21:32:06 -0400
Subject: Make Sebastian's misc-reasons branch compile; frob the changes file
Commit: 6a77bde8d887bb9dd46c5c75e8bffb2f402feb39

---
 changes/misc-reason |    8 +++++---
 src/or/reasons.c    |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/changes/misc-reason b/changes/misc-reason
index cd21718..9d173fd 100644
--- a/changes/misc-reason
+++ b/changes/misc-reason
@@ -1,4 +1,6 @@
   o Minor bugfixes:
-    - Exit nodes didn't recognize EHOSTUNREACH as a stream ending reason
-      and sent back END_STREAM_REASON_NOROUTE. Also update the spec to
-      reflect this new reason. Bugfix on 0.1.0.1-rc; fixes bug 1793.
+    - Exit nodes didn't recognize EHOSTUNREACH as a plausible error
+      code, and sent back END_STREAM_REASON_MISC.  They now send a a
+      new stream ending reason: END_STREAM_REASON_NOROUTE. Also update
+      the spec to reflect this new reason. Bugfix on 0.1.0.1-rc; fixes
+      bug 1793.
diff --git a/src/or/reasons.c b/src/or/reasons.c
index 8d71f3b..8bce362 100644
--- a/src/or/reasons.c
+++ b/src/or/reasons.c
@@ -28,7 +28,7 @@ stream_end_reason_to_control_string(int reason)
     case END_STREAM_REASON_DESTROY: return "DESTROY";
     case END_STREAM_REASON_DONE: return "DONE";
     case END_STREAM_REASON_TIMEOUT: return "TIMEOUT";
-    case END_STREAM_REASON_NOROUTE: "return "NOROUTE";
+    case END_STREAM_REASON_NOROUTE: return "NOROUTE";
     case END_STREAM_REASON_HIBERNATING: return "HIBERNATING";
     case END_STREAM_REASON_INTERNAL: return "INTERNAL";
     case END_STREAM_REASON_RESOURCELIMIT: return "RESOURCELIMIT";
-- 
1.7.1