[tor-commits] [tor/master] Remove changes/bug7129

[nickm at torproject.org]

commit 4164f481c81a6e3529821424e4a8ae044288b0ee
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 17 09:49:36 2012 -0400

    Remove changes/bug7129
    
    Our convention is that we use the changelog to note release-to-release
    changes; we don't need to add changelog entries for bugs that didn't
    appear in any released version of Tor.  (By convention, we sometimes
    say "this bug does not appear in any released version of Tor" or words
    to that effect in the commit message so that when Roger goes to make
    sure the changelog is right, he knows not to expect a changelog entry
    for that part.)
---
 changes/bug7129 |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/changes/bug7129 b/changes/bug7129
deleted file mode 100644
index d021623..0000000
--- a/changes/bug7129
+++ /dev/null
@@ -1,6 +0,0 @@
- 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.