[tor-commits] [tor/master] Fix mal-merge, don't | END_CIRC_REASON_CHANNEL_CLOSED into reason codes in circuit_truncated()

[nickm at torproject.org]

commit 17442560c44e8093f9a67d7809ed799317d4d707
Author: Andrea Shepard <andrea at torproject.org>
Date:   Wed Oct 17 03:23:35 2012 -0700

    Fix mal-merge, don't | END_CIRC_REASON_CHANNEL_CLOSED into reason codes in circuit_truncated()
---
 src/or/circuitbuild.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 9287084..b16dab2 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