[tor-commits] [orbot/master] Merge branch '505' of https://github.com/sisbell/orbot into sisbell-505