commit e3fd4afafbd29d7089af7379f6141e1bffa311e5 Merge: aa8ad867 a32452e7 Author: n8fr8 nathan@guardianproject.info Date: Wed May 29 16:57:45 2019 -0400

Merge branch 'no_personalized_learning_kb' of https://github.com/bitmold/orbot into bitmold-no_personalized_learning_kb

.../android/settings/SettingsPreferences.java | 37 ++++++++++++++-------- .../android/ui/NoPersonalizedLearningEditText.java | 13 ++++++++ .../ui/hiddenservices/dialogs/AddCookieDialog.java | 4 +-- .../ui/hiddenservices/dialogs/HSDataDialog.java | 4 +-- .../res/layout/layout_add_client_cookie_dialog.xml | 4 +-- app/src/main/res/layout/layout_hs_backups_list.xml | 1 - app/src/main/res/layout/layout_hs_data_dialog.xml | 8 ++--- app/src/main/res/layout/layout_settings.xml | 29 ----------------- 8 files changed, 47 insertions(+), 53 deletions(-)