[tor-commits] [tor/release-0.2.8] what went wrong such that this changelog stanza got in twice?

[arma@xxxxxxxxxxxxxx]

commit af0ba0338997be295cb53e775fd96292363b42e0
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Fri Jul 29 12:25:41 2016 -0400

    what went wrong such that this changelog stanza got in twice?
---
 ChangeLog    | 2 --
 ReleaseNotes | 2 --
 2 files changed, 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index edc326f..c6837dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -844,8 +844,6 @@ Changes in version 0.2.8.1-alpha - 2016-02-04
       17819; bugfix on 0.2.6.3-alpha.
     - Fix backtrace compilation on FreeBSD. Fixes bug 17827; bugfix
       on 0.2.5.2-alpha.
-    - Fix compilation of sandbox.c with musl-libc. Fixes bug 17347;
-      bugfix on 0.2.5.1-alpha. Patch from "jamestk".
     - Fix search for libevent libraries on OpenBSD (and other systems
       that install libevent 1 and libevent 2 in parallel). Fixes bug
       16651; bugfix on 0.1.0.7-rc. Patch from "rubiate".
diff --git a/ReleaseNotes b/ReleaseNotes
index d2dcc19..a5cd305 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -416,8 +416,6 @@ Changes in version 0.2.8.6 - 2015-07-3?
       17819; bugfix on 0.2.6.3-alpha.
     - Fix backtrace compilation on FreeBSD. Fixes bug 17827; bugfix
       on 0.2.5.2-alpha.
-    - Fix compilation of sandbox.c with musl-libc. Fixes bug 17347;
-      bugfix on 0.2.5.1-alpha. Patch from "jamestk".
     - Fix search for libevent libraries on OpenBSD (and other systems
       that install libevent 1 and libevent 2 in parallel). Fixes bug
       16651; bugfix on 0.1.0.7-rc. Patch from "rubiate".

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits