Merge remote-tracking branch 'origin/patches-2.0'

diff --cc http.c
index d07730d7a85f0875da81db1932c57fb96a5f6e8d,9b96ffb3b2313ec6f91b96d5c557bf491f52f770..b94fed8c93ebc502d2b7190f6c3894c1934b8ec5
--- 1/http.c
--- 2/http.c
+++ b/http.c
@@@ -2328,8 -2179,10 +2328,10 @@@ evhttp_connection_get_peer(struct evhtt
  }
  
  int
 -evhttp_connection_connect(struct evhttp_connection *evcon)
 +evhttp_connection_connect_(struct evhttp_connection *evcon)
  {
+       int old_state = evcon->state;
+ 
        if (evcon->state == EVCON_CONNECTING)
                return (0);
  

diff --cc test/regress_http.c
index 31412a2088efc53b97ad4f5bfdf4a91cf3840521,9ece455bb6652d15e299ad004a0ed53bd5742072..3ed314a030f4f60c751670dc7e2504d6fd8d97b5
--- 1/test/regress_http.c
--- 2/test/regress_http.c
+++ b/test/regress_http.c
@@@ -3034,8 -3013,11 +3034,11 @@@ http_stream_in_cancel_test(void *arg
  static void
  http_connection_fail_done(struct evhttp_request *req, void *arg)
  {
+        struct evhttp_connection *evcon = arg;
+        struct event_base *base = evhttp_connection_get_base(evcon);
+ 
         /* An ENETUNREACH error results in an unrecoverable
 -        * evhttp_connection error (see evhttp_connection_fail()).  The
 +        * evhttp_connection error (see evhttp_connection_fail_()).  The
          * connection will be reset, and the user will be notified with a NULL
          * req parameter. */
         tt_assert(!req);