Bläddra i källkod

Merge branch 'maint-0.2.8'

Nick Mathewson 8 år sedan
förälder
incheckning
6deeedb5e0
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      changes/bug20103
  2. 1 1
      changes/geoip-september2016

+ 1 - 1
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

+ 1 - 1
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.