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

Merge branch 'maint-0.3.4' into maint-0.3.5

Nick Mathewson 5 years ago

parent

967efc0d28 c4f7953d8b

commit

c1f86f7492

3 changed files with 597 additions and 606 deletions

Split View Show Diff Stats

						
							+ 4
							
							- 0
						
changes/geoip-2018-12-05
							 
								View File
							
				@@ -0,0 +1,4 @@
			
				+  o Minor features (geoip):
			
				+    - Update geoip and geoip6 to the December 5 2018 Maxmind GeoLite2
			
				+      Country database. Closes ticket 28744.
			
				+

				
					File diff suppressed because it is too large
					
						+ 256
						
						- 185
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 337
						
						- 421
					
src/config/geoip6