Make Sebastian's misc-reasons branch compile; frob the changes file

diff --git a/changes/misc-reason b/changes/misc-reason
index cd217185337866b6573a420104f5d1926711e197..9d173fd3c1bd0ac3df1b2db06bdd7b3295d0c7de 100644 (file)
--- 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 8d71f3b39e6a461f13e2b797509a98376347e014..8bce3625d81719912ffbcf1cf725d06692d4a1e4 100644 (file)
--- 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";