Merge remote-tracking branch 'public/easy_ratelim'

Conflicts:
	src/or/connection.c

diff --cc src/common/log.c
Simple merge

diff --cc src/common/torlog.h
Simple merge

diff --cc src/common/util.h
Simple merge

diff --cc src/or/buffers.c
Simple merge

diff --cc src/or/circuituse.c
Simple merge

diff --cc src/or/connection.c
index d0602fde24165839c37f519a6f9f75d194984b5d,5da4d39ba55604a09775172880b73fd9e911453f..7b0f081fdebba5efec1dce618fac8a5d9c18f828
--- 1/src/or/connection.c
--- 2/src/or/connection.c
+++ b/src/or/connection.c
@@@ -1444,12 -1441,13 +1444,9 @@@ connection_connect(connection_t *conn, 
      /* We should never even try to connect anyplace if DisableNetwork is set.
       * Warn if we do, and refuse to make the connection. */
      static ratelim_t disablenet_violated = RATELIM_INIT(30*60);
-     char *m;
 -#ifdef _WIN32
 -    *socket_error = WSAENETUNREACH;
 -#else
 -    *socket_error = ENETUNREACH;
 -#endif
 +    *socket_error = SOCK_ERRNO(ENETUNREACH);
-     if ((m = rate_limit_log(&disablenet_violated, approx_time()))) {
-       log_warn(LD_BUG, "Tried to open a socket with DisableNetwork set.%s", m);
-       tor_free(m);
-     }
+     log_fn_ratelim(&disablenet_violated, LOG_WARN, LD_BUG,
+                    "Tried to open a socket with DisableNetwork set.");
      tor_fragile_assert();
      return -1;
    }

diff --cc src/or/router.c
Simple merge