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

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

Nick Mathewson 9 years ago

parent

efae1bcef6 e5907e94c2

commit

cb8c5c023f

2 changed files with 355 additions and 248 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 352
						
						- 248
					
src/config/geoip