Merge branch 'maint-0.2.2' · 630337e762 - CrySP Git Service

Merge branch 'maint-0.2.2'

Roger Dingledine 12 years ago

parent

06b10ccdc4 0582746e0d

commit

630337e762

2 changed files with 273 additions and 131 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 270
						
						- 131
					
src/config/geoip