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

[n8fr8 at torproject.org]

commit 9b9bab3a7562f185221039df22074924b2ece29c
Merge: 25150a3 ec6083f
Author: Nathan Freitas <nathan at freitas.net>
Date:   Mon Jan 25 23:53:14 2016 -0500

    Merge branch 'new-bridges' of https://github.com/mrphs/orbot into mrphs-fixes

 assets/bridges.txt |    4 ++++
 1 file changed, 4 insertions(+)