Merge remote-tracking branch 'origin/maint-0.2.7' · 4da2f89f95 - CrySP Git Service

Merge remote-tracking branch 'origin/maint-0.2.7'

Nick Mathewson 8 years ago

parent

9e461588a6 7c3f210e70

commit

4da2f89f95

3 changed files with 694 additions and 323 deletions

Split View Show Diff Stats

						
							+ 3
							
							- 0
						
changes/geoip-october2015
							 
								View File
							
				@@ -0,0 +1,3 @@
			
				+  o Minor features:
			
				+    - Update geoip and geoip6 to the October 9 2015 Maxmind GeoLite2 Country database.
			
				+

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

				
					File diff suppressed because it is too large
					
						+ 284
						
						- 125
					
src/config/geoip6