* Merge from Debian testing, remaining changes: - Drop dependencies not in main: + Build-Depends: Drop stunnel and libssh2-1-dev. + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends. - Add new libcurl3-udeb package, stripped down for use during installation (LP: #831496). * Dropped changes: - debian/patches/timeout_bug_736216: applied upstream.