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

[n8fr8@xxxxxxxxxxxxxx]

commit 25150a329c05d70cba0c3acd33fbd00096ef40ac
Merge: da7eb96 8a00ab1
Author: Nathan Freitas <nathan@xxxxxxxxxxx>
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(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits