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

[n8fr8 at torproject.org]

commit 129b55a4e3c0a7e54a71c94e651154145171014e
Merge: 1bef9632 b0a49903
Author: n8fr8 <nathan at freitas.net>
Date:   Thu Sep 6 23:24:38 2018 -0400

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

 app/src/main/res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)