make hg link secure
merge 3.4