[tor-commits] [orbot/master] Merge branch 'syphyr-master'

[n8fr8 at torproject.org]

commit ab472d54452263f4ca5d3c2adcfc27000ba77d41
Merge: 792ee2b1 4fc3e7e6
Author: n8fr8 <nathan at freitas.net>
Date:   Thu Jan 4 17:48:57 2018 -0500

    Merge branch 'syphyr-master'

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