Merge branch 'maint-0.2.4' into maint-0.2.5 · 46754d6081 - CrySP Git Service

Merge branch 'maint-0.2.4' into maint-0.2.5

Nick Mathewson 7 years ago

parent

d95c2809b3 1410947351

commit

46754d6081

3 changed files with 528 additions and 377 deletions

Split View Show Diff Stats

						
							+ 4
							
							- 0
						
changes/geoip-august2016
							 
								View File
							
				@@ -0,0 +1,4 @@
			
				+  o Minor features:
			
				+    - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
			
				+      Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 218
						
						- 225
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 306
						
						- 152
					
src/config/geoip6