Merge branch 'maint-0.3.0' · 3f40d9ec20 - CrySP Git Service

Merge branch 'maint-0.3.0'

Nick Mathewson 7 年之前

父節點

4f4d3de80c 493d9cd17b

當前提交

3f40d9ec20

共有 3 個文件被更改，包括 619 次插入 和 226 次删除

分割檢視顯示文件統計

						
							+ 4
							
							- 0
						
changes/geoip-june2017
							 
								查看文件
							
				@@ -0,0 +1,4 @@
			
				+  o Minor features:
			
				+    - Update geoip and geoip6 to the June 8 2017 Maxmind GeoLite2
			
				+      Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 270
						
						- 141
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 345
						
						- 85
					
src/config/geoip6