Merge branch 'maint-0.2.5' into maint-0.2.6 · 089ee13534 - CrySP Git Service

Merge branch 'maint-0.2.5' into maint-0.2.6

Nick Mathewson 8 years ago

parent

2ec5e24c58 e8e89fd7a1

commit

089ee13534

3 changed files with 1019 additions and 201 deletions

Split View Show Diff Stats

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

				
					File diff suppressed because it is too large
					
						+ 384
						
						- 103
					
src/config/geoip

				
					File diff suppressed because it is too large
					
						+ 631
						
						- 98
					
src/config/geoip6