Merge branch 'maint-0.2.6' into maint-0.2.7-redux · 25c28bc2d9 - CrySP Git Service

Merge branch 'maint-0.2.6' into maint-0.2.7-redux

Nick Mathewson 7 jaren geleden

bovenliggende

b5526bef38 ecc73c3c03

commit

25c28bc2d9

3 gewijzigde bestanden met toevoegingen van 418 en 495 verwijderingen

Zij-aan-zij weergave Toon Diff Stats

						
							+ 4
							
							- 0
						
changes/geoip-march2017
							 
								Bestand weergeven
							
				@@ -0,0 +1,4 @@
			
				+  o Minor features:
			
				+    - Update geoip and geoip6 to the March 7 2017 Maxmind GeoLite2
			
				+      Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 149
						
						- 428
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 265
						
						- 67
					
src/config/geoip6