Merge branch 'maint-0.2.1' into maint-0.2.2 · 83e3975c8b - CrySP Git Service

Merge branch 'maint-0.2.1' into maint-0.2.2

Roger Dingledine 14 years ago

parent

7aa20b20bf bf4b819aae

commit

83e3975c8b

2 changed files with 530 additions and 94 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 527
						
						- 94
					
src/config/geoip