Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4 · df4c484021 - CrySP Git Service

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

Nick Mathewson 9 years ago

parent

dbd5a9a8f9 a9ce0cd659

commit

df4c484021

2 changed files with 371 additions and 90 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
changes/geoip6-january2015
							 
								View File
							
				@@ -0,0 +1,2 @@
			
				+  o Minor features:
			
				+    - Update geoip6 to the January 7 2015 Maxmind GeoLite2 Country database.

				
					File diff suppressed because it is too large
					
						+ 369
						
						- 90
					
src/config/geoip6