summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2012-10-17 03:24:42 -0700
committerAndrea Shepard <andrea@torproject.org>2012-10-17 03:24:42 -0700
commitcaa24a1f2de62bad56242526d15901e15593e3fd (patch)
tree29d1b78013322ccd75cc679b019c6631bf171f1d
parent35f573136da3c1b662114cfcc6369df1b5d7b98e (diff)
downloadtor-caa24a1f2de62bad56242526d15901e15593e3fd.tar.gz
tor-caa24a1f2de62bad56242526d15901e15593e3fd.zip
Add changes file for bug 7129
-rw-r--r--changes/bug71296
1 files changed, 6 insertions, 0 deletions
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.