commit 50d01b1fbc6e776d0b39f42f644137dd25a92c7a Merge: 8d307a6 ccaf68c Author: Georg Koppen gk@torproject.org Date: Thu Sep 26 14:58:05 2019 +0000

Merge remote-tracking branch 'sysrqb/bug31192_00'

.../android/service/AndroidTorSettings.java | 5 +++++ .../org/torproject/android/service/TorService.java | 4 ++-- service/src/main/jniLibs/arm64-v8a/libTor.so | Bin 7774616 -> 8610184 bytes service/src/main/jniLibs/armeabi-v7a/libTor.so | Bin 7774616 -> 8129728 bytes service/src/main/jniLibs/armeabi/libTor.so | Bin 7774616 -> 0 bytes service/src/main/jniLibs/x86/libTor.so | Bin 7791604 -> 9020648 bytes service/src/main/jniLibs/x86_64/libTor.so | Bin 7791604 -> 8254824 bytes 7 files changed, 7 insertions(+), 2 deletions(-)