Merge branch 'mig5-censorship_automatically_attempt_and_reconnect' into 1422_autodetect_location

cli/onionshare_cli/settings.py

@@ -111,9 +111,11 @@ class Settings(object):
             "bridges_builtin_pt": "obfs4",  # "obfs4", "meek-azure", or "snowflake"
             "bridges_moat": "",
             "bridges_custom": "",
+            "bridges_builtin": {},
             "persistent_tabs": [],
             "locale": None,  # this gets defined in fill_in_defaults()
             "theme": 0,
+            "censorship_circumvention": False,
         }
         self._settings = {}
         self.fill_in_defaults()