setup-dchroot: merge from tor (genname split into function, ubuntu updates)