Merge branch 'maint-0.2.7' · 58bcae37a2 - CrySP Git Service

Merge branch 'maint-0.2.7'

Nick Mathewson 8 years ago

parent

63b4ce1f7e 17cfdb358c

commit

58bcae37a2

3 changed files with 572 additions and 808 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 416
						
						- 172
					
src/config/geoip

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