From caa24a1f2de62bad56242526d15901e15593e3fd Mon Sep 17 00:00:00 2001
From: Andrea Shepard <andrea@torproject.org>
Date: Wed, 17 Oct 2012 03:24:42 -0700
Subject: [PATCH] Add changes file for bug 7129

---
 changes/bug7129 | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changes/bug7129

diff --git a/changes/bug7129 b/changes/bug7129
new file mode 100644
index 0000000000..d021623a3e
--- /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.