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