Merge remote branch 'origin/maint-0.2.1' · bedb59c034 - CrySP Git Service

Merge remote branch 'origin/maint-0.2.1'

Nick Mathewson 15 years ago

parent

f4f11adf4c 2f67ef58b7

commit

bedb59c034

2 changed files with 262 additions and 164 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
changes/geoip-update-june2010
							 
								View File
							
				@@ -0,0 +1,2 @@
			
				+  o Minor features
			
				+    - Update to the June 1 2010 Maxmind GeoLite Country database.

				
					File diff suppressed because it is too large
					
						+ 260
						
						- 164
					
src/config/geoip