summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-09-29 17:17:59 -0400
committerRoger Dingledine <arma@torproject.org>2010-09-29 17:17:59 -0400
commit48cd096276590e40540bc255b2610931351b14cb (patch)
tree31653a7ee4bdc1ec46328afe73e7738f7eee0302 /src/or/or.h
parent474e4d2722d52cf225a88cb7b7c677273b8f50ac (diff)
parent4caf39f1c8db6acc25f84df024073d43c04c8645 (diff)
downloadtor-48cd096276590e40540bc255b2610931351b14cb.tar.gz
tor-48cd096276590e40540bc255b2610931351b14cb.zip
Merge commit 'mikeperry/bug1739' into maint-0.2.2
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 69b0d6be29..7aee493b39 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -614,6 +614,10 @@ typedef enum {
/* Negative reasons are internal: we never send them in a DESTROY or TRUNCATE
* call; they only go to the controller for tracking */
+/** Our post-timeout circuit time measurement period expired.
+ * We must give up now */
+#define END_CIRC_REASON_MEASUREMENT_EXPIRED -3
+
/** We couldn't build a path for this circuit. */
#define END_CIRC_REASON_NOPATH -2
/** Catch-all "other" reason for closing origin circuits. */