Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 · 69b4138c00 - CrySP Git Service

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Nick Mathewson 14 years ago

parent

734ba2f937 bad609ae6b

commit

69b4138c00

2 changed files with 514 additions and 128 deletions

Split View Show Diff Stats

						
							+ 3
							
							- 0
						
changes/geoip-oct2010
							 
								View File
							
				@@ -0,0 +1,3 @@
			
				+  o Minor features:
			
				+    - Update to the October 1 2010 Maxmind GeoLite Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 511
						
						- 128
					
src/config/geoip