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

Merge branch 'maint-0.2.1' into maint-0.2.2

Roger Dingledine 13 years ago

parent

85c539009a 4180624a7d

commit

a70ff4b2cb

2 changed files with 532 additions and 82 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 529
						
						- 82
					
src/config/geoip