summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-05-22 11:40:52 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-22 11:40:52 -0400
commit94754c54145f62f6106f9c05563f3ba1f995ad84 (patch)
treec7b6989dca172392cceb61750111f7f04779eba8
parent9a50c731040fea3b85b0c84726d56194993f09e9 (diff)
downloadtor-94754c54145f62f6106f9c05563f3ba1f995ad84.tar.gz
tor-94754c54145f62f6106f9c05563f3ba1f995ad84.zip
Fold new entries into changelog
-rw-r--r--ChangeLog9
-rw-r--r--changes/bug205095
-rw-r--r--changes/bug219693
3 files changed, 9 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 08016bd3e0..2f72339bee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,11 @@ Changes in version 0.3.1.1-alpha - 2017-05-??
relay is unexpectedly large, this log message is at notice level.
Otherwise it is at info.
+ o Major bugfixes (entry guards):
+ - Don't block bootstrapping when a primary bridge is offline and we can't
+ get its descriptor. Fixes bug 22325; fixes one case of bug 21969;
+ bugfix on 0.3.0.3-alpha.
+
o Major bugfixes (linux TPROXY support):
- Fix a typo that had prevented TPROXY-based transparent proxying
from working under Linux. Fixes bug 18100; bugfix on 0.2.6.3-alpha.
@@ -988,6 +993,10 @@ Changes in version 0.3.0.4-rc - 2017-03-01
- Reject version numbers with components that exceed INT32_MAX.
Otherwise 32-bit and 64-bit platforms would behave inconsistently.
Fixes bug 21450; bugfix on 0.0.8pre1.
+ - Directory authorities now reject relays running versions
+ 0.2.9.1-alpha through 0.2.9.4-alpha, because those relays
+ suffer from bug 20499 and don't keep their consensus cache
+ up-to-date. Resolves ticket 20509.
o Minor features (geoip):
- Update geoip and geoip6 to the February 8 2017 Maxmind GeoLite2
diff --git a/changes/bug20509 b/changes/bug20509
deleted file mode 100644
index a39ca9f60b..0000000000
--- a/changes/bug20509
+++ /dev/null
@@ -1,5 +0,0 @@
- o Minor features:
- - Directory authorities now reject relays running versions
- 0.2.9.1-alpha through 0.2.9.4-alpha, because those relays
- suffer from bug 20499 and don't keep their consensus cache
- up-to-date. Resolves ticket 20509.
diff --git a/changes/bug21969 b/changes/bug21969
deleted file mode 100644
index 5da8c4de32..0000000000
--- a/changes/bug21969
+++ /dev/null
@@ -1,3 +0,0 @@
- o Major bugfixes (entry guards):
- - Don't block bootstrapping when a primary bridge is offline and we can't
- get its descriptor. Fixes one case of bug 21969; bugfix on 0.3.0.3-alpha.