fold in the changes entries

8 files changed, 35 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index acfa034834..9326673c20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+Changes in version 0.2.7.6 - 2015-12-10
+  Tor version 0.2.7.6 fixes a major bug in entry guard selection, as
+  well as a minor bug in hidden service reliability.
+
+  o Major bugfixes:
+    - Actually look at the Guard flag when selecting a new directory
+      guard. When we implemented the directory guard design, we
+      accidentally started treating all relays as if they have the Guard
+      flag during guard selection, leading to weaker anonymity and worse
+      performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered
+      by Mohsen Imani.
+
+  o Minor bugfixes (correctness):
+    - When displaying an IPv6 exit policy, include the mask bits correctly
+      even when the number is greater than 31. Fixes bug 16056; bugfix on
+      0.2.4.7-alpha. Patch from "gturner".
+    - The wrong list was used when looking up expired intro points in
+      a rend service object, causing what we think could be reachability
+      issues for hidden services, and triggering a BUG log. Fixes bug
+      16702; bugfix on 0.2.7.2-alpha.
+    - Fix undefined behavior in the tor_cert_checksig function. Fixes bug
+      17722; bugfix on 0.2.7.2-alpha.
+
+  o Minor bugfixes (compilation):
+    - When checking for net/pfvar.h, include netinet/in.h if possible.
+      This fixes transparent proxy detection on OpenBSD. Fixes bug
+      17551; bugfix on 0.1.2.1-alpha. Patch from "rubiate".
+    - Fix a compilation warning with Clang 3.6: Do not check the
+      presence of an address which can never be NULL. Fixes bug 17781.
+
+  o Minor features:
+    - Update geoip and geoip6 to the December 1 2015 Maxmind GeoLite2
+      Country database.
+
+
 Changes in version 0.2.7.5 - 2015-11-20
   The Tor 0.2.7 release series is dedicated to the memory of Tor user
   and privacy advocate Caspar Bowden (1961-2015). Caspar worked
diff --git a/changes/bug16056 b/changes/bug16056
deleted file mode 100644
index e3311c0f93..0000000000
--- a/changes/bug16056
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (relay, IPv6):
-    - When displaying an IPv6 exit policy, include the mask bits correctly
-      even when the number is greater than 31. Fixes bug 16056; bugfix on
-      0.2.4.7-alpha. Patch from "gturner".
\ No newline at end of file
diff --git a/changes/bug16702 b/changes/bug16702
deleted file mode 100644
index 5de36cd351..0000000000
--- a/changes/bug16702
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (hidden service)
-    - The wrong list was used when looking up expired intro points in a rend
-      service object causing what we think could be reachability issues and
-      triggering a BUG log. Fixes 16702; bugfix on tor-0.2.7.2-alpha.
diff --git a/changes/bug17551 b/changes/bug17551
deleted file mode 100644
index 27e467979e..0000000000
--- a/changes/bug17551
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-    - When checking for net/pfvar.h, include netinet/in.h if possible.
-      This fixes transparent proxy detection on OpenBSD. Fixes bug
-      17551; bugfix on 0.1.2.1-alpha. Patch from "rubiate".
diff --git a/changes/bug17722 b/changes/bug17722
deleted file mode 100644
index 1b18d4af2b..0000000000
--- a/changes/bug17722
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (code correctness)
-    - Fix undefined behavior in the tor_cert_checksig function. Fixes bug
-      17722; bugfix on tor-0.2.7.2-alpha.
diff --git a/changes/bug17772 b/changes/bug17772
deleted file mode 100644
index 54d457c601..0000000000
--- a/changes/bug17772
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes (guard selection):
-    - Actually look at the Guard flag when selecting a new directory
-      guard. When we implemented the directory guard design, we
-      accidentally started treating all relays as if they have the Guard
-      flag during guard selection, leading to weaker anonymity and worse
-      performance. Fixes bug 17222; bugfix on 0.2.4.8-alpha. Discovered
-      by Mohsen Imani.
diff --git a/changes/bug17781 b/changes/bug17781
deleted file mode 100644
index 01ed231b0a..0000000000
--- a/changes/bug17781
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Compilation fixes:
-    - Fix a compilation warning with Clang 3.6: Do not check the
-      presence of an address which can never be NULL. Fixes bug 17781.
diff --git a/changes/geoip-december2015 b/changes/geoip-december2015
deleted file mode 100644
index 597bcc92f8..0000000000
--- a/changes/geoip-december2015
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the December 1 2015 Maxmind GeoLite2
-      Country database.
-