Merge branch 'maint-0.2.8' into release-0.2.8

2016-09-22 09:00:23 -04:00 · 2016-09-22 09:00:23 -04:00 · caa16bffc7
parent a8b607bfdd 1edea87c2a
commit caa16bffc7
2 changed files with 2 additions and 2 deletions
--- 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
--- 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.