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

[n8fr8 at torproject.org]

commit 043b151fb1ea57f9e9843c89cb2c18bb4e087ae0
Merge: c8584f6 5eb628b
Author: Nathan Freitas <nathan at freitas.net>
Date:   Mon Feb 22 11:05:37 2016 -0500

    Merge branch '1984-bridges' of https://github.com/mrphs/orbot into dev_nima_1984_bridges

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