[tor-commits] [tor-messenger-build/master] Rebase prepare patch, again