diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-22 09:00:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-22 09:00:23 -0400 |
| commit | caa16bffc75b8e36ae3f834c52e9b107513e263f (patch) | |
| tree | a94e0ca6d4b112ff1027c71dc98682a127efc8f7 | |
| parent | a8b607bfddd1acf2896cb12dd80389e4b1d66a24 (diff) | |
| parent | 1edea87c2ac66d9d9ba5c92e6b2e4baddb6bd886 (diff) | |
| download | tor-caa16bffc75b8e36ae3f834c52e9b107513e263f.tar.gz tor-caa16bffc75b8e36ae3f834c52e9b107513e263f.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -rw-r--r-- | changes/bug20103 | 2 | ||||
| -rw-r--r-- | changes/geoip-september2016 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/changes/bug20103 b/changes/bug20103 index c2b81d3797..bf0aeec009 100644 --- a/changes/bug20103 +++ b/changes/bug20103 @@ -1,4 +1,4 @@ - o Major bug fixes (crash): + o Major bugfixes (crash): - Fix a complicated crash bug that could affect Tor clients configured to use bridges when replacing a networkstatus consensus diff --git a/changes/geoip-september2016 b/changes/geoip-september2016 index a14c7c699f..1bf5570f2d 100644 --- a/changes/geoip-september2016 +++ b/changes/geoip-september2016 @@ -1,4 +1,4 @@ - o Minor features: + o Minor features (geoip): - Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2 Country database. |