Merge branch 'maint-0.2.5' into maint-0.2.9 · b68e636b33 - CrySP Git Service

Merge branch 'maint-0.2.5' into maint-0.2.9

Nick Mathewson 6 years ago

parent

4bb7d9fd12 1fa396b0a4

commit

b68e636b33

3 changed files with 750 additions and 1147 deletions

Split View Show Diff Stats

						
							+ 4
							
							- 0
						
changes/geoip-2018-04-03
							 
								View File
							
				@@ -0,0 +1,4 @@
			
				+  o Minor features (geoip):
			
				+    - Update geoip and geoip6 to the April 3 2018 Maxmind GeoLite2
			
				+      Country database. Closes ticket 25718.
			
				+

				
					File diff suppressed because it is too large
					
						+ 574
						
						- 312
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 172
						
						- 835
					
src/config/geoip6