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

Merge branch 'maint-0.2.6' into maint-0.2.7

Nick Mathewson 8 years ago

parent

1a065cea46 0b477bfd55

commit

7fe80c2905

3 changed files with 584 additions and 352 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 287
						
						- 229
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 293
						
						- 123
					
src/config/geoip6