Merge branch 'maint-0.2.6' into maint-0.2.7-redux · 44bc8821b1 - CrySP Git Service

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

Nick Mathewson 7 years ago

parent

25c28bc2d9 21d776738c

commit

44bc8821b1

3 changed files with 728 additions and 203 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 461
						
						- 141
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 263
						
						- 62
					
src/config/geoip6