[tor-commits] [orbot/master] Merge pull request #190 from SkewedZeppelin/master

[n8fr8 at torproject.org]

commit f93c11e74599cc24c7467d58ba0fc81c38c3c496
Merge: d4befad1 8ab13f63
Author: Nathan Freitas <nathan at freitas.net>
Date:   Tue Mar 12 16:51:49 2019 -0400

    Merge pull request #190 from SkewedZeppelin/master
    
    Expose IPv6 related options and enable IPv6 support

 app/src/main/res/values/strings.xml                |  4 +++
 app/src/main/res/xml/preferences.xml               | 15 ++++++++--
 build.gradle                                       |  2 +-
 .../torproject/android/service/OrbotConstants.java |  3 ++
 .../org/torproject/android/service/TorService.java | 32 ++++++++++++++--------
 5 files changed, 42 insertions(+), 14 deletions(-)