[tor-commits] [community/staging] apply lost dip patches overwritten by torpusher