From: Roger Dingledine <arma@torproject.org>
Date: Thu, 15 Jul 2010 01:06:49 +0000 (-0400)
Subject: print right controller purpose string for measure-timeout circs
X-Git-Tag: tor-0.2.2.15-alpha~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54cdac97f150f670e60f7ce0590e3bbf428d394a;p=thirdparty%2Ftor.git

print right controller purpose string for measure-timeout circs
---

diff --git a/changes/string-for-measure-timeout-circs b/changes/string-for-measure-timeout-circs
new file mode 100644
index 0000000000..39e7f96162
--- /dev/null
+++ b/changes/string-for-measure-timeout-circs
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - When the controller is reporting the purpose of circuits that
+      didn't finish building before the circuit build timeout, it was
+      printing UNKNOWN_13. Now print EXPIRED. Bugfix on 0.2.2.14-alpha.
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index d71d6a21b0..e18e892661 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -352,6 +352,8 @@ circuit_purpose_to_controller_string(uint8_t purpose)
 
     case CIRCUIT_PURPOSE_TESTING:
       return "TESTING";
+    case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT:
+      return "EXPIRED";
     case CIRCUIT_PURPOSE_CONTROLLER:
       return "CONTROLLER";