Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 · ddfb398494 - CrySP Git Service

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
	src/config/geoip

Nick Mathewson 13 年之前

父節點

f924fbf19f 35148ba532

當前提交

ddfb398494

共有 2 個文件被更改，包括 509 次插入 和 73 次删除

分割檢視顯示文件統計

						
							+ 3
							
							- 0
						
changes/geoip-dec2010
							 
								查看文件
							
				@@ -0,0 +1,3 @@
			
				+  o Minor features:
			
				+    - Update to the December 1 2010 Maxmind GeoLite Country database.
			
				+

				
					File diff suppressed because it is too large
					
						+ 506
						
						- 73
					
src/config/geoip