Fix mal-merge, don't | END_CIRC_REASON_CHANNEL_CLOSED into reason codes in circuit_tr...

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 9287084cbb77c0c5d9ce0733689e2a5a8546611e..b16dab2cca29564431dd93384cff4e6cc33c74a6 100644 (file)
--- 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