[tor-commits] [tor/master] Add changes file for bug 7129

[nickm at torproject.org]

commit caa24a1f2de62bad56242526d15901e15593e3fd
Author: Andrea Shepard <andrea at torproject.org>
Date:   Wed Oct 17 03:24:42 2012 -0700

    Add changes file for bug 7129
---
 changes/bug7129 |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/changes/bug7129 b/changes/bug7129
new file mode 100644
index 0000000..d021623
--- /dev/null
+++ b/changes/bug7129
@@ -0,0 +1,6 @@
+ o Minor bugfixes:
+   - Fix mal-merge of channels that ORed END_CIRC_REASON_CHANNEL_CLOSED into
+     reason codes in circuit_truncated().
+   - Fix unknown reason warning in circuit_end_reason_to_control_string()
+     to use LD_PROTOCOL rather than LD_BUG when the bad reason originated
+     elsewhere.