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