Merge branch 'maint-0.2.1' into maint-0.2.2 · 7206d784dc - CrySP Git Service

Merge branch 'maint-0.2.1' into maint-0.2.2

Roger Dingledine 14 years ago

parent

ec25c1f6ca e7b10e5ecf

commit

7206d784dc

2 changed files with 656 additions and 78 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 653
						
						- 78
					
src/config/geoip