diff options
| author | Andrea Shepard <andrea@torproject.org> | 2012-10-17 03:23:35 -0700 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2012-10-17 03:23:35 -0700 |
| commit | 17442560c44e8093f9a67d7809ed799317d4d707 (patch) | |
| tree | bc0fccf039564a4fde1022c9748bbb471acdf38d | |
| parent | 94a030990986e6c731141da3969aeae3ec0f5ea8 (diff) | |
| download | tor-17442560c44e8093f9a67d7809ed799317d4d707.tar.gz tor-17442560c44e8093f9a67d7809ed799317d4d707.zip | |
Fix mal-merge, don't | END_CIRC_REASON_CHANNEL_CLOSED into reason codes in circuit_truncated()
| -rw-r--r-- | 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 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 |