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

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

Nick Mathewson 9 years ago

parent

cb8c5c023f 08e14e1448

commit

fde4199e1c

2 changed files with 435 additions and 302 deletions

Split View Show Diff Stats

						
							+ 3
							
							- 0
						
changes/geoip6-june2015
							 
								View File
							
				@@ -0,0 +1,3 @@
			
				+  o Minor features:
			
				+    - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 432
						
						- 302
					
src/config/geoip6