Merge branch 'maint-0.3.4' into maint-0.3.5 · 76ed869ff9 - CrySP Git Service

Merge branch 'maint-0.3.4' into maint-0.3.5

Nick Mathewson 5 years ago

parent

2ac2d0a426 6b2ff4fff8

commit

76ed869ff9

3 changed files with 908 additions and 761 deletions

Split View Show Diff Stats

						
							+ 4
							
							- 0
						
changes/geoip-2018-11-06
							 
								View File
							
				@@ -0,0 +1,4 @@
			
				+  o Minor features (geoip):
			
				+    - Update geoip and geoip6 to the November 6 2018 Maxmind GeoLite2
			
				+      Country database. Closes ticket 28395.
			
				+

				
					File diff suppressed because it is too large
					
						+ 320
						
						- 438
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 584
						
						- 323
					
src/config/geoip6