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

[n8fr8 at torproject.org]

commit 977167be3a30376ae6512b0c7d40688f0d85e6b6
Merge: b07d4feb 898f64a8
Author: n8fr8 <nathan at freitas.net>
Date:   Sun Dec 3 15:37:43 2017 +0530

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

 BUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)