commit 1da072c0051b4ca05ec667ed516ce8edcb8186fe Merge: caaf2b5 188fbd6 Author: Sukhbir Singh sukhbir@torproject.org Date: Wed May 4 13:14:59 2016 -0400

Merge pull request #30 from u451f/post-secure-autoconfig

Secure autoconfiguration

chrome/content/emailwizard.js | 111 ++++++++++++++++++++--------------------- chrome/content/emailwizard.xul | 2 +- chrome/content/preferences.js | 40 +++++---------- components/torbirdy.js | 10 +++- 4 files changed, 75 insertions(+), 88 deletions(-)