[tor-commits] [orbot/master] Merge pull request #32 from ghost/patch-1

[n8fr8 at torproject.org]

commit 6e45c07c7d3765499170dcb3651d99d64e84e89f
Merge: 6452075 21c5bcc
Author: Nathan Freitas <nathan at freitas.net>
Date:   Tue Mar 22 16:20:14 2016 -0400

    Merge pull request #32 from ghost/patch-1
    
    Start meek transport whe using custom meek bridges

 src/org/torproject/android/service/TorService.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)