瀏覽代碼

Merge branch 'maint-0.2.8'

Nick Mathewson 8 年之前
父節點
當前提交
6deeedb5e0
共有 2 個文件被更改,包括 2 次插入2 次删除
  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.