Merge remote-tracking branch 'origin/maint-0.2.4' · 173a1afc58 - CrySP Git Service

Merge remote-tracking branch 'origin/maint-0.2.4'

Nick Mathewson 10 years ago

parent

55c7a559df f5ce580bab

commit

173a1afc58

3 changed files with 837 additions and 545 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 510
						
						- 148
					
src/config/geoip

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