Merge branch 'maint-0.2.7-redux' into maint-0.2.8 · dc34cd7a04 - CrySP Git Service

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

Nick Mathewson 7 years ago

parent

91c6b18ca0 71dd1d716a

commit

dc34cd7a04

3 changed files with 814 additions and 150 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 527
						
						- 92
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 283
						
						- 58
					
src/config/geoip6