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

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

Nick Mathewson 11 years ago

parent

d21b24b3b6 2658e70d16

commit

d7950eda2b

2 changed files with 171 additions and 161 deletions

Split View Show Diff Stats

						
							+ 3
							
							- 0
						
changes/geoip-february2014-regcountry
							 
								View File
							
				@@ -0,0 +1,3 @@
			
				+  o Minor features:
			
				+    - Fix our version of the February 7 2014 Maxmind GeoLite2 Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 168
						
						- 161
					
src/config/geoip