Commit 17442560 authored by Andrea Shepard's avatar Andrea Shepard
Browse files

Fix mal-merge, don't | END_CIRC_REASON_CHANNEL_CLOSED into reason codes in circuit_truncated()

parent 94a03099

src/or/circuitbuild.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3050,7 +3050,7 @@ circuit_truncated(origin_circuit_t *circ, crypt_path_t *layer, int reason) 
   *     just give up.

   *     just give up.

   */

   */

  circuit_mark_for_close(TO_CIRCUIT(circ),

  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;

  return 0;





#if 0

#if 0