Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4 · 3bc28c4c04 - CrySP Git Service

Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4

Nick Mathewson 10 years ago

parent

ab774a8500 40579cb6a5

commit

3bc28c4c04

2 changed files with 327 additions and 397 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
changes/geoip6-june2014
							 
								View File
							
				@@ -0,0 +1,2 @@
			
				+  o Minor features:
			
				+    - Update geoip6 to the June 4 2014 Maxmind GeoLite2 Country database.

				
					File diff suppressed because it is too large
					
						+ 325
						
						- 397
					
src/config/geoip6