Merge branch 'maint-0.2.5' into maint-0.2.6 · 6862eada65 - CrySP Git Service

Merge branch 'maint-0.2.5' into maint-0.2.6

Nick Mathewson 7 years ago

parent

f794b40ec0 0bfd1c318c

commit

6862eada65

3 changed files with 668 additions and 178 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 357
						
						- 128
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 307
						
						- 50
					
src/config/geoip6