Merge 0.9->0.10

diff --cc net/http.lua
index 0c0ef967eb734dc55a5dd7616d1112c023d32fe0,8ce474948c9737a12f346c1fb3c195455e93d9bd..e6bf00188d2bccfa9a1eb70d44d833d2c60c7f00
--- 1/net/http.lua
--- 2/net/http.lua
+++ b/net/http.lua
@@@ -172,10 -172,10 +172,10 @@@ function request(u, ex, callback
                callback(nil, 0, req);
                return nil, err;
        end
 -      
 +
        local sslctx = false;
        if using_https then
-               sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2" } };
+               sslctx = ex and ex.sslctx or { mode = "client", protocol = "sslv23", options = { "no_sslv2", "no_sslv3" } };
        end
  
        req.handler, req.conn = assert(server.wrapclient(conn, host, port_number, listener, "*a", sslctx));

diff --cc prosodyctl
Simple merge

diff --cc util/stanza.lua
Simple merge