Merge branch 'maint-0.2.6' into maint-0.2.7 · d920cbb82c - CrySP Git Service

Merge branch 'maint-0.2.6' into maint-0.2.7

Nick Mathewson 8 years ago

parent

7d1fe7c9e7 44ad3be221

commit

d920cbb82c

3 changed files with 619 additions and 231 deletions

Split View Show Diff Stats

						
							+ 4
							
							- 0
						
changes/geoip-february2016
							 
								View File
							
				@@ -0,0 +1,4 @@
			
				+  o Minor features:
			
				+    - Update geoip and geoip6 to the February 2 2016 Maxmind GeoLite2
			
				+      Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 294
						
						- 106
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 321
						
						- 125
					
src/config/geoip6