From: Andrea Shepard Date: Wed, 17 Oct 2012 10:23:35 +0000 (-0700) Subject: Fix mal-merge, don't | END_CIRC_REASON_CHANNEL_CLOSED into reason codes in circuit_tr... X-Git-Tag: tor-0.2.4.4-alpha~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17442560c44e8093f9a;p=thirdparty%2Ftor.git Fix mal-merge, don't | END_CIRC_REASON_CHANNEL_CLOSED into reason codes in circuit_truncated() --- 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