Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 · dbd5a9a8f9 - CrySP Git Service

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Nick Mathewson 10 years ago

parent

137982f955 c3f8f5ab0e

commit

dbd5a9a8f9

2 changed files with 147 additions and 1063 deletions

Split View Show Diff Stats

						
							+ 3
							
							- 0
						
changes/geoip-january2015
							 
								View File
							
				@@ -0,0 +1,3 @@
			
				+  o Minor features:
			
				+    - Update geoip to the January 7 2015 Maxmind GeoLite2 Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 144
						
						- 1063
					
src/config/geoip