Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 · 6acf0ac285 - CrySP Git Service

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

Nick Mathewson 11 years ago

parent

3367a7611e 9630fb917f

commit

6acf0ac285

2 changed files with 201 additions and 225 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 198
						
						- 225
					
src/config/geoip