commit bf8789ba0fb5e1cbb3310be3308898f62b432a82 Merge: 015a935c 8db5c3a0 Author: Nathan Freitas nathan@guardianproject.info Date: Tue Apr 27 12:12:13 2021 -0400

Merge pull request #449 from bitmold/fix_448_hostedv3_backup_bug

Fixes #448 Restoring Backup of Hosted v3 Onion Servics

.../ui/hiddenservices/backup/BackupUtils.java | 16 ++++- .../ui/hiddenservices/database/HSDatabase.java | 11 ++-- .../ui/v3onionservice/OnionServiceDatabase.java | 8 ++- app/src/main/res/values/strings.xml | 1 + .../torproject/android/service/OrbotService.java | 71 +++++++++++++++------- 5 files changed, 77 insertions(+), 30 deletions(-)