Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

14 files changed, 67 insertions, 0 deletions

diff --git a/changes/bug13988 b/changes/bug13988
new file mode 100644
index 0000000000..e816335a3b
--- /dev/null
+++ b/changes/bug13988
@@ -0,0 +1,3 @@
+  o Minor bugfixes (statistics):
+    - Increase period over which bandwidth observations are aggregated
+      from 15 minutes to 4 hours. Fixes bug 13988; bugfix on 0.0.8pre1.
diff --git a/changes/bug14013 b/changes/bug14013
new file mode 100644
index 0000000000..640cf859f5
--- /dev/null
+++ b/changes/bug14013
@@ -0,0 +1,6 @@
+  o Major bugfixes:
+    - When reading a hexadecimal, base-32, or base-64 encoded value
+      from a string, always overwrite the complete output buffer. This
+      prevents some bugs where we would look at (but fortunately, not
+      reveal) uninitialized memory on the stack. Fixes bug 14013;
+      bugfix on all versions of Tor.
diff --git a/changes/bug14125 b/changes/bug14125
new file mode 100644
index 0000000000..fe6821a332
--- /dev/null
+++ b/changes/bug14125
@@ -0,0 +1,5 @@
+  o Minor bugfixes (dirauth):
+    - Enlarge the buffer to read bw-auth generated files to avoid an
+      issue when parsing the file in dirserv_read_measured_bandwidths().
+      Bugfix on 0.2.2.1-alpha, fixes #14125.
+
diff --git a/changes/bug14129 b/changes/bug14129
new file mode 100644
index 0000000000..6153cd84fd
--- /dev/null
+++ b/changes/bug14129
@@ -0,0 +1,7 @@
+  o Major bugfixes (exit node stability):
+
+    - Fix an assertion failure that could occur under high DNS load.  Fixes
+      bug 14129; bugfix on Tor 0.0.7rc1. Found by "jowr"; diagnosed and fixed
+      by "cypherpunks".
+
+
diff --git a/changes/bug14142-parse-virtual-addr b/changes/bug14142-parse-virtual-addr
new file mode 100644
index 0000000000..f78b7c7d81
--- /dev/null
+++ b/changes/bug14142-parse-virtual-addr
@@ -0,0 +1,7 @@
+  o Minor bugfixes (client):
+    - Check for a missing option value in parse_virtual_addr_network
+      before asserting on the NULL in tor_addr_parse_mask_ports.
+      This avoids crashing on torrc lines like
+      Vi[rtualAddrNetworkIPv[4|6]] when no value follows the option.
+      Bugfix on 0.2.3 (de4cc126cbb5 on 24 November 2012), fixes #14142.
+      Patch by "teor".
diff --git a/changes/bug14195 b/changes/bug14195
new file mode 100644
index 0000000000..d2b82f31b0
--- /dev/null
+++ b/changes/bug14195
@@ -0,0 +1,3 @@
+  o Minor bugfixes (client):
+    - Fix a memory leak when using AutomapHostsOnResolve.
+      Fixes bug 14195; bugfix on 0.1.0.1-rc.
diff --git a/changes/bug14220 b/changes/bug14220
new file mode 100644
index 0000000000..51cfa502bc
--- /dev/null
+++ b/changes/bug14220
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - Build without warnings with the stock OpenSSL srtp.h header,
+      which has a duplicate declaration of SSL_get_selected_srtp_profile().
+      Fixes bug 14220; this is OpenSSL's bug, not ours.
diff --git a/changes/bug14261 b/changes/bug14261
new file mode 100644
index 0000000000..1260ccba1e
--- /dev/null
+++ b/changes/bug14261
@@ -0,0 +1,5 @@
+  O Minor bugfixes (directory authority):
+    - Allow directory authorities to fetch more data from one
+      another if they find themselves missing lots of votes.
+      Previously, they had been bumping against the 10 MB queued
+      data limit. Fixes bug 14261. Bugfix on 0.1.2.5-alpha.
diff --git a/changes/bug15083 b/changes/bug15083
new file mode 100644
index 0000000000..5cc79b5ba1
--- /dev/null
+++ b/changes/bug15083
@@ -0,0 +1,10 @@
+  o Major bugfixes (relay, stability, possible security):
+    - Fix a bug that could lead to a relay crashing with an assertion
+      failure if a buffer of exactly the wrong layout was passed
+      to buf_pullup() at exactly the wrong time. Fixes bug 15083;
+      bugfix on 0.2.0.10-alpha. Patch from 'cypherpunks'.
+
+    - Do not assert if the 'data' pointer on a buffer is advanced to the very
+      end of the buffer; log a BUG message instead.  Only assert if it is
+      past that point. Fixes bug 15083; bugfix on 0.2.0.10-alpha.
+
diff --git a/changes/bug15088 b/changes/bug15088
new file mode 100644
index 0000000000..95878bdb39
--- /dev/null
+++ b/changes/bug15088
@@ -0,0 +1,4 @@
+  o Minor bugfixes (Linux seccomp2 sandbox):
+    - Upon receiving sighup, do not crash during attempts to call
+      wait4. Fixes bug 15088; bugfix on 0.2.5.1-alpha. Patch from
+      "sanic".
diff --git a/changes/geoip-january2015 b/changes/geoip-january2015
new file mode 100644
index 0000000000..67324f27f2
--- /dev/null
+++ b/changes/geoip-january2015
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip to the January 7 2015 Maxmind GeoLite2 Country database.
+
diff --git a/changes/geoip6-january2015 b/changes/geoip6-january2015
new file mode 100644
index 0000000000..b86fe2be57
--- /dev/null
+++ b/changes/geoip6-january2015
@@ -0,0 +1,2 @@
+  o Minor features:
+    - Update geoip6 to the January 7 2015 Maxmind GeoLite2 Country database.
diff --git a/changes/ticket14128 b/changes/ticket14128
new file mode 100644
index 0000000000..38b25fa7dc
--- /dev/null
+++ b/changes/ticket14128
@@ -0,0 +1,5 @@
+  o Minor features (controller):
+    - New "GETINFO bw-event-cache" to get information about recent bandwidth
+      events. Closes ticket 14128. Useful for controllers to get recent
+      bandwidth history after the fix for 13988.
+
diff --git a/changes/ticket14487 b/changes/ticket14487
new file mode 100644
index 0000000000..577337ff24
--- /dev/null
+++ b/changes/ticket14487
@@ -0,0 +1,3 @@
+  o Directory authority IP change:
+    - The directory authority Faravahar has a new IP address. Closes
+      ticket 14487.