Merge branch 'maint-0.2.2' · 068046eebc - CrySP Git Service

Merge branch 'maint-0.2.2'

Roger Dingledine 12 years ago

parent

7516b4ac99 229abbf4bb

commit

068046eebc

2 changed files with 613 additions and 87 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 610
						
						- 87
					
src/config/geoip