Fix conflicts arising from the reuse_private_key branch

test/test_onionshare.py

@@ -27,6 +27,7 @@ from onionshare import OnionShare
 class MyOnion:
     def __init__(self, stealth=False):
         self.auth_string = 'TestHidServAuth'
+        self.private_key = ''
         self.stealth = stealth
 
     @staticmethod

test/test_onionshare_settings.py

@@ -60,7 +60,11 @@ class TestSettings:
             'autoupdate_timestamp': None,
             'no_bridges': True,
             'tor_bridges_use_obfs4': False,
-            'tor_bridges_use_custom_bridges': ''
+            'tor_bridges_use_custom_bridges': '',
+            'save_private_key': False,
+            'private_key': '',
+            'slug': '',
+            'hidservauth_string': ''
         }
 
     def test_fill_in_defaults(self, settings_obj):