bug7129 302 B

123456
  1. o Minor bugfixes:
  2. - Fix mal-merge of channels that ORed END_CIRC_REASON_CHANNEL_CLOSED into
  3. reason codes in circuit_truncated().
  4. - Fix unknown reason warning in circuit_end_reason_to_control_string()
  5. to use LD_PROTOCOL rather than LD_BUG when the bad reason originated
  6. elsewhere.