aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-11 11:23:47 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-11 11:23:47 -0400
commit5958261f23188d449a5a3ef0753239ab334d5826 (patch)
tree634ad5ca43376e14d08ff43e8b8ae1695f1a331a
parent102c7d7b2cfcacf2ed6dbab9a97a5a22fc775ea8 (diff)
downloadtor-5958261f23188d449a5a3ef0753239ab334d5826.tar.gz
tor-5958261f23188d449a5a3ef0753239ab334d5826.zip
Remove bug12693 changelog entry.
It looks like this was stale and sitting around uncommitted in my changes directory, having not been committed on my bug12693_025 branch. The fix for bug12693_025 is not in fact merged.
-rw-r--r--ChangeLog2
1 files changed, 0 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f3b603fe4e..16df957fa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,8 +63,6 @@ Changes in version 0.2.5.7-rc - 2014-09-1x
by "teor".
o Minor bugfixes (compilation):
- - Allow our autoconf to run correctly with autoconf 2.62 again.
- Fixes bug 12693; bugfix on 0.2.5.2-alpha.
- Fix compilation of test.h with MSVC. Patch from Gisle Vanem;
bugfix on 0.2.5.5-alpha.
- Make the nmake make files work again. Fixes bug 13081. Bugfix on