Merge branch 'maint-0.2.9' into maint-0.3.1 · 04a8e81fa9 - CrySP Git Service

Merge branch 'maint-0.2.9' into maint-0.3.1

Nick Mathewson 6 years ago

parent

9cbc40e376 0ddc2dc531

commit

04a8e81fa9

3 changed files with 972 additions and 214 deletions

Split View Show Diff Stats

						
							+ 4
							
							- 0
						
changes/geoip-2018-02-07
							 
								View File
							
				@@ -0,0 +1,4 @@
			
				+  o Minor features (geoip):
			
				+    - Update geoip and geoip6 to the February 7 2018 Maxmind GeoLite2
			
				+      Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 693
						
						- 145
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 275
						
						- 69
					
src/config/geoip6