[tor-commits] [manual/develop] Merge remote-tracking branch 'cleo/patch-2'