diff options
| author | Kali Kaneko <kali@leap.se> | 2013-10-30 11:33:27 -0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-10-30 11:33:27 -0200 |
| commit | e959577c7c86689820d75e460ebee23209692a7d (patch) | |
| tree | 9c64777de1204c4ae73fdafee8c23517198b384d | |
| parent | dba45ace351caa4c097f1ee1498e164cf4683a4f (diff) | |
| parent | 0f5d0e2b3f2c2403f2c518b984bf11d01d799bb0 (diff) | |
Merge remote-tracking branch 'ivan-github/bug/4330_soledad-bootstrapping-problem' into develop
| -rw-r--r-- | src/leap/bitmask/services/soledad/soledadbootstrapper.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/bitmask/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py index fec60338..d06cc910 100644 --- a/src/leap/bitmask/services/soledad/soledadbootstrapper.py +++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py @@ -246,7 +246,7 @@ class SoledadBootstrapper(AbstractBootstrapper): try: self._soledad = Soledad( uuid, - self._password.encode('utf-8'), + self._password, secrets_path=secrets_path.encode(encoding), local_db_path=local_db_path.encode(encoding), server_url=server_url, |