Merge branch 'maint-0.2.2' · 9bfb8af265 - CrySP Git Service

Merge branch 'maint-0.2.2'

Roger Dingledine 12 years ago

parent

ff03347579 a1074c7aa2

commit

9bfb8af265

2 changed files with 387 additions and 134 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 384
						
						- 134
					
src/config/geoip