Bug 1035747 - Fix dangerous public destructors specific to FreeBSD. r=bjacob
Bug 997770 - Allow users to explicitly input the connection timeout. Also the  version of marionette_transport is updated from 0.2 to 0.3. r=mdas