Merge branch 'maint-0.2.5' into maint-0.2.8 · bcf2b413c3 - CrySP Git Service

Merge branch 'maint-0.2.5' into maint-0.2.8

Nick Mathewson 7 years ago

parent

93b28972c1 09618ffe38

commit

bcf2b413c3

3 changed files with 535 additions and 370 deletions

Split View Show Diff Stats

						
							+ 4
							
							- 0
						
changes/geoip-september2017
							 
								View File
							
				@@ -0,0 +1,4 @@
			
				+  o Minor features:
			
				+    - Update geoip and geoip6 to the September 6 2017 Maxmind GeoLite2
			
				+      Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 231
						
						- 258
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 300
						
						- 112
					
src/config/geoip6