Merge proposals

tsocks in Ubuntu has no merge proposals.