From c9f24edb13faf17dc314be51127736acfc3de17a Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Mon, 21 Nov 2011 18:04:01 -0500
Subject: [PATCH] fold in more changes entries
---
ChangeLog | 7 +++++++
changes/bug3963 | 5 -----
changes/bug4360 | 3 ---
changes/bug4521 | 3 ---
4 files changed, 7 insertions(+), 11 deletions(-)
delete mode 100644 changes/bug3963
delete mode 100644 changes/bug4360
delete mode 100644 changes/bug4521
diff --git a/ChangeLog b/ChangeLog
index fada7d869a..8efc37942f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,9 @@ Changes in version 0.2.3.8-alpha - 2011-11-21
by Anders Sundman.
- Fix parsing of some corner-cases with tor_inet_pton(). Fixes
bug 4515; bugfix on 0.2.0.1-alpha; fix by Anders Sundman.
+ - When configuring, starting, or stopping an NT service, stop
+ immediately after the service configuration attempt has succeeded
+ or failed. Fixes bug 3963; bugfix on 0.2.0.7-alpha.
- When sending a NETINFO cell, include the original address
received for the other side, not its canonical address. Found
by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha.
@@ -57,6 +60,8 @@ Changes in version 0.2.3.8-alpha - 2011-11-21
- Fix a memory leak in launch_direct_bridge_descriptor_fetch() that
occurred when a client tried to fetch a descriptor for a bridge
in ExcludeNodes. Fixes bug 4383; bugfix on 0.2.2.25-alpha.
+ - Backport fixes for a pair of compilation warnings on Windows.
+ Fixes bug 4521; bugfix on 0.2.2.28-beta and on 0.2.2.29-beta.
- When running as a client, do not print a misleading (and plain
wrong) log message that we're collecting "directory request"
statistics: clients don't collect statistics. Also don't create a
@@ -108,6 +113,8 @@ Changes in version 0.2.3.8-alpha - 2011-11-21
old built-in one. OpenSSL's AES has been better for a while, and
relatively few servers should still be on any version of OpenSSL
that doesn't have good optimized assembly AES.
+ - Use the name "CERTS" consistently to refer to the new cell type;
+ we were calling it CERT in some places and CERTS in others.
o Testing:
- Numerous new unit tests for functions in util.c and address.c by
diff --git a/changes/bug3963 b/changes/bug3963
deleted file mode 100644
index 2fc44a095c..0000000000
--- a/changes/bug3963
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor bugfixes:
- - When configuring, starting, or stopping an NT service, stop
- immediately after the service configuration attempt has succeeded
- or failed. Fixes bug3963; bugfix on 0.2.0.7-alpha.
-
diff --git a/changes/bug4360 b/changes/bug4360
deleted file mode 100644
index 93afa8204d..0000000000
--- a/changes/bug4360
+++ /dev/null
@@ -1,3 +0,0 @@
- o Code simplification and refactoring:
- - Use the name "CERTS" consistently to refer to the new cell type;
- we were calling it CERT in some places and CERTS in others.
diff --git a/changes/bug4521 b/changes/bug4521
deleted file mode 100644
index 9b0bae9b00..0000000000
--- a/changes/bug4521
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes:
- - Backport fixes for a pair of compilation warnings on Windows.
- Fixes bug 4521; bugfix on 0.2.2.28-beta and on 0.2.2.29-beta.
--
GitLab