Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 · 64410cc888 - CrySP Git Service

Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

Nick Mathewson 12 years ago

parent

0b9c515870 41bf8fa889

commit

64410cc888

2 changed files with 188 additions and 249 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 185
						
						- 249
					
src/config/geoip