[tor-commits] [manual/master] Squashed commit of the following: