[tor-commits] [orbot/master] Merge pull request #495 from SkewedZeppelin/fixup