Tajik rebels surrender after threat of new assault