Bug 1059001 - Part 3: Add encryption socket option. r=past
Bug 1059001 - Part 4: Pass encryption through via discovery. r=past
Bug 1059001 - Part 5: Reset connection options before connecting. r=paul