From 17442560c44e8093f9a67d7809ed799317d4d707 Mon Sep 17 00:00:00 2001
From: Andrea Shepard <andrea@torproject.org>
Date: Wed, 17 Oct 2012 03:23:35 -0700
Subject: Fix mal-merge, don't | END_CIRC_REASON_CHANNEL_CLOSED into reason
 codes in circuit_truncated()

---
 src/or/circuitbuild.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/or')

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 9287084cbb..b16dab2cca 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -3050,7 +3050,7 @@ circuit_truncated(origin_circuit_t *circ, crypt_path_t *layer, int reason)
    *     just give up.
    */
   circuit_mark_for_close(TO_CIRCUIT(circ),
-          END_CIRC_REASON_FLAG_REMOTE|END_CIRC_REASON_CHANNEL_CLOSED|reason);
+          END_CIRC_REASON_FLAG_REMOTE|reason);
   return 0;
 
 #if 0
-- 
cgit v1.2.3-54-g00ecf