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

[n8fr8 at torproject.org]

commit dbf13dcc5942436b7e3124761091219ce25dc84a
Merge: 2055823e e71c225e
Author: Nathan Freitas <nathan at guardianproject.info>
Date:   Tue Oct 29 09:27:30 2019 -0400

    Merge pull request #270 from SkewedZeppelin/master
    
    Expose *CircuitPadding

 app-mini/src/main/res/values/strings.xml                   |  4 ++++
 app-mini/src/main/res/xml/preferences.xml                  | 14 +++++++++++++-
 app/src/main/res/values/strings.xml                        |  4 ++++
 app/src/main/res/xml/preferences.xml                       | 14 +++++++++++++-
 .../org/torproject/android/service/OrbotConstants.java     |  2 ++
 .../java/org/torproject/android/service/TorService.java    | 12 ++++++++++++
 6 files changed, 48 insertions(+), 2 deletions(-)