[tor-commits] [orbot/master] Merge branch 'master' of github.com:n8fr8/orbot

[n8fr8 at torproject.org]

commit 40233543d32d1d5bcd8abd8bb6c6aff908f7e389
Merge: 8e7a811 6e45c07
Author: Nathan Freitas <nathan at freitas.net>
Date:   Tue Mar 22 16:20:26 2016 -0400

    Merge branch 'master' of github.com:n8fr8/orbot

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