[tor-commits] [orbot/master] Merge branch 'bug-18148' of https://github.com/mrphs/orbot into mrphs-fixes

commit 25150a329c05d70cba0c3acd33fbd00096ef40ac Merge: da7eb96 8a00ab1 Author: Nathan Freitas <nathan@freitas.net> Date: Mon Jan 25 23:52:59 2016 -0500 Merge branch 'bug-18148' of https://github.com/mrphs/orbot into mrphs-fixes assets/bridges.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)