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

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

Nick Mathewson 10 years ago

parent

6704e18dd2 beda8d2934

commit

5588e677bd

2 changed files with 974 additions and 119 deletions

Split View Show Diff Stats

						
							+ 3
							
							- 0
						
changes/geoip-march2015
							 
								View File
							
				@@ -0,0 +1,3 @@
			
				+  o Minor features:
			
				+    - Update geoip to the March 3 2015 Maxmind GeoLite2 Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 971
						
						- 119
					
src/config/geoip