Rename log() to tor_log() for logging

This is meant to avoid conflict with the built-in log() function in
math.h.  It resolves ticket 7599.  First reported by dhill.

This was generated with the following perl script:

 #!/usr/bin/perl -w -i -p

 s/\blog\(LOG_(ERR|WARN|NOTICE|INFO|DEBUG)\s*,\s*/log_\L$1\(/g;

 s/\blog\(/tor_log\(/g;

23 files changed, 131 insertions, 131 deletions

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 7868a45488..e5fac9172d 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -335,11 +335,11 @@ buf_dump_freelist_sizes(int severity)
 {
 #ifdef ENABLE_BUF_FREELISTS
   int i;
-  log(severity, LD_MM, "====== Buffer freelists:");
+  tor_log(severity, LD_MM, "====== Buffer freelists:");
   for (i = 0; freelists[i].alloc_size; ++i) {
     uint64_t total = ((uint64_t)freelists[i].cur_length) *
       freelists[i].alloc_size;
-    log(severity, LD_MM,
+    tor_log(severity, LD_MM,
         U64_FORMAT" bytes in %d %d-byte chunks ["U64_FORMAT
         " misses; "U64_FORMAT" frees; "U64_FORMAT" hits]",
         U64_PRINTF_ARG(total),
@@ -348,7 +348,7 @@ buf_dump_freelist_sizes(int severity)
         U64_PRINTF_ARG(freelists[i].n_free),
         U64_PRINTF_ARG(freelists[i].n_hit));
   }
-  log(severity, LD_MM, U64_FORMAT" allocations in non-freelist sizes",
+  tor_log(severity, LD_MM, U64_FORMAT" allocations in non-freelist sizes",
       U64_PRINTF_ARG(n_freelist_miss));
 #else
   (void)severity;
diff --git a/src/or/channel.c b/src/or/channel.c
index b30e5483cf..104b018cf4 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -2636,10 +2636,10 @@ void
 channel_dumpstats(int severity)
 {
   if (all_channels && smartlist_len(all_channels) > 0) {
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "Dumping statistics about %d channels:",
         smartlist_len(all_channels));
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "%d are active, and %d are done and waiting for cleanup",
         (active_channels != NULL) ?
           smartlist_len(active_channels) : 0,
@@ -2649,10 +2649,10 @@ channel_dumpstats(int severity)
     SMARTLIST_FOREACH(all_channels, channel_t *, chan,
                       channel_dump_statistics(chan, severity));
 
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "Done spamming about channels now");
   } else {
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "No channels to dump");
   }
 }
@@ -2668,10 +2668,10 @@ void
 channel_listener_dumpstats(int severity)
 {
   if (all_listeners && smartlist_len(all_listeners) > 0) {
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "Dumping statistics about %d channel listeners:",
         smartlist_len(all_listeners));
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "%d are active and %d are done and waiting for cleanup",
         (active_listeners != NULL) ?
           smartlist_len(active_listeners) : 0,
@@ -2681,10 +2681,10 @@ channel_listener_dumpstats(int severity)
     SMARTLIST_FOREACH(all_listeners, channel_listener_t *, chan_l,
                       channel_listener_dump_statistics(chan_l, severity));
 
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "Done spamming about channel listeners now");
   } else {
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "No channel listeners to dump");
   }
 }
@@ -3139,13 +3139,13 @@ channel_dump_statistics(channel_t *chan, int severity)
 
   age = (double)(now - chan->timestamp_created);
 
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       "Channel " U64_FORMAT " (at %p) with transport %s is in state "
       "%s (%d)",
       U64_PRINTF_ARG(chan->global_identifier), chan,
       channel_describe_transport(chan),
       channel_state_to_string(chan->state), chan->state);
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel " U64_FORMAT " was created at " U64_FORMAT
       " (" U64_FORMAT " seconds ago) "
       "and last active at " U64_FORMAT " (" U64_FORMAT " seconds ago)",
@@ -3158,14 +3158,14 @@ channel_dump_statistics(channel_t *chan, int severity)
   /* Handle digest and nickname */
   if (!tor_digest_is_zero(chan->identity_digest)) {
     if (chan->nickname) {
-      log(severity, LD_GENERAL,
+      tor_log(severity, LD_GENERAL,
           " * Channel " U64_FORMAT " says it is connected "
           "to an OR with digest %s and nickname %s",
           U64_PRINTF_ARG(chan->global_identifier),
           hex_str(chan->identity_digest, DIGEST_LEN),
           chan->nickname);
     } else {
-      log(severity, LD_GENERAL,
+      tor_log(severity, LD_GENERAL,
           " * Channel " U64_FORMAT " says it is connected "
           "to an OR with digest %s and no known nickname",
           U64_PRINTF_ARG(chan->global_identifier),
@@ -3173,13 +3173,13 @@ channel_dump_statistics(channel_t *chan, int severity)
     }
   } else {
     if (chan->nickname) {
-      log(severity, LD_GENERAL,
+      tor_log(severity, LD_GENERAL,
           " * Channel " U64_FORMAT " does not know the digest"
           " of the OR it is connected to, but reports its nickname is %s",
           U64_PRINTF_ARG(chan->global_identifier),
           chan->nickname);
     } else {
-      log(severity, LD_GENERAL,
+      tor_log(severity, LD_GENERAL,
           " * Channel " U64_FORMAT " does not know the digest"
           " or the nickname of the OR it is connected to",
           U64_PRINTF_ARG(chan->global_identifier));
@@ -3191,7 +3191,7 @@ channel_dump_statistics(channel_t *chan, int severity)
   if (have_remote_addr) {
     char *actual = tor_strdup(channel_get_actual_remote_descr(chan));
     remote_addr_str = tor_dup_addr(&remote_addr);
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         " * Channel " U64_FORMAT " says its remote address"
         " is %s, and gives a canonical description of \"%s\" and an "
         "actual description of \"%s\"",
@@ -3203,7 +3203,7 @@ channel_dump_statistics(channel_t *chan, int severity)
     tor_free(actual);
   } else {
     char *actual = tor_strdup(channel_get_actual_remote_descr(chan));
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         " * Channel " U64_FORMAT " does not know its remote "
         "address, but gives a canonical description of \"%s\" and an "
         "actual description of \"%s\"",
@@ -3214,7 +3214,7 @@ channel_dump_statistics(channel_t *chan, int severity)
   }
 
   /* Handle marks */
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel " U64_FORMAT " has these marks: %s %s %s "
       "%s %s %s",
       U64_PRINTF_ARG(chan->global_identifier),
@@ -3233,7 +3233,7 @@ channel_dump_statistics(channel_t *chan, int severity)
         "incoming" : "outgoing");
 
   /* Describe queues */
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel " U64_FORMAT " has %d queued incoming cells"
       " and %d queued outgoing cells",
       U64_PRINTF_ARG(chan->global_identifier),
@@ -3241,7 +3241,7 @@ channel_dump_statistics(channel_t *chan, int severity)
       chan_cell_queue_len(&chan->outgoing_queue));
 
   /* Describe circuits */
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel " U64_FORMAT " has %d active circuits out of"
       " %d in total",
       U64_PRINTF_ARG(chan->global_identifier),
@@ -3251,25 +3251,25 @@ channel_dump_statistics(channel_t *chan, int severity)
          circuitmux_num_circuits(chan->cmux) : 0);
 
   /* Describe timestamps */
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel " U64_FORMAT " was last used by a "
       "client at " U64_FORMAT " (" U64_FORMAT " seconds ago)",
       U64_PRINTF_ARG(chan->global_identifier),
       U64_PRINTF_ARG(chan->timestamp_client),
       U64_PRINTF_ARG(now - chan->timestamp_client));
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel " U64_FORMAT " was last drained at "
       U64_FORMAT " (" U64_FORMAT " seconds ago)",
       U64_PRINTF_ARG(chan->global_identifier),
       U64_PRINTF_ARG(chan->timestamp_drained),
       U64_PRINTF_ARG(now - chan->timestamp_drained));
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel " U64_FORMAT " last received a cell "
       "at " U64_FORMAT " (" U64_FORMAT " seconds ago)",
       U64_PRINTF_ARG(chan->global_identifier),
       U64_PRINTF_ARG(chan->timestamp_recv),
       U64_PRINTF_ARG(now - chan->timestamp_recv));
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel " U64_FORMAT " last trasmitted a cell "
       "at " U64_FORMAT " (" U64_FORMAT " seconds ago)",
       U64_PRINTF_ARG(chan->global_identifier),
@@ -3277,7 +3277,7 @@ channel_dump_statistics(channel_t *chan, int severity)
       U64_PRINTF_ARG(now - chan->timestamp_xmit));
 
   /* Describe counters and rates */
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel " U64_FORMAT " has received "
       U64_FORMAT " cells and transmitted " U64_FORMAT,
       U64_PRINTF_ARG(chan->global_identifier),
@@ -3288,13 +3288,13 @@ channel_dump_statistics(channel_t *chan, int severity)
     if (chan->n_cells_recved > 0) {
       avg = (double)(chan->n_cells_recved) / age;
       if (avg >= 1.0) {
-        log(severity, LD_GENERAL,
+        tor_log(severity, LD_GENERAL,
             " * Channel " U64_FORMAT " has averaged %f "
             "cells received per second",
             U64_PRINTF_ARG(chan->global_identifier), avg);
       } else if (avg >= 0.0) {
         interval = 1.0 / avg;
-        log(severity, LD_GENERAL,
+        tor_log(severity, LD_GENERAL,
             " * Channel " U64_FORMAT " has averaged %f "
             "seconds between received cells",
             U64_PRINTF_ARG(chan->global_identifier), interval);
@@ -3303,13 +3303,13 @@ channel_dump_statistics(channel_t *chan, int severity)
     if (chan->n_cells_xmitted > 0) {
       avg = (double)(chan->n_cells_xmitted) / age;
       if (avg >= 1.0) {
-        log(severity, LD_GENERAL,
+        tor_log(severity, LD_GENERAL,
             " * Channel " U64_FORMAT " has averaged %f "
             "cells transmitted per second",
             U64_PRINTF_ARG(chan->global_identifier), avg);
       } else if (avg >= 0.0) {
         interval = 1.0 / avg;
-        log(severity, LD_GENERAL,
+        tor_log(severity, LD_GENERAL,
             " * Channel " U64_FORMAT " has averaged %f "
             "seconds between transmitted cells",
             U64_PRINTF_ARG(chan->global_identifier), interval);
@@ -3337,13 +3337,13 @@ channel_listener_dump_statistics(channel_listener_t *chan_l, int severity)
 
   age = (double)(now - chan_l->timestamp_created);
 
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       "Channel listener " U64_FORMAT " (at %p) with transport %s is in "
       "state %s (%d)",
       U64_PRINTF_ARG(chan_l->global_identifier), chan_l,
       channel_listener_describe_transport(chan_l),
       channel_listener_state_to_string(chan_l->state), chan_l->state);
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel listener " U64_FORMAT " was created at " U64_FORMAT
       " (" U64_FORMAT " seconds ago) "
       "and last active at " U64_FORMAT " (" U64_FORMAT " seconds ago)",
@@ -3353,7 +3353,7 @@ channel_listener_dump_statistics(channel_listener_t *chan_l, int severity)
       U64_PRINTF_ARG(chan_l->timestamp_active),
       U64_PRINTF_ARG(now - chan_l->timestamp_active));
 
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
       " * Channel listener " U64_FORMAT " last accepted an incoming "
         "channel at " U64_FORMAT " (" U64_FORMAT " seconds ago) "
         "and has accepted " U64_FORMAT " channels in total",
@@ -3371,13 +3371,13 @@ channel_listener_dump_statistics(channel_listener_t *chan_l, int severity)
       chan_l->n_accepted > 0) {
     avg = (double)(chan_l->n_accepted) / age;
     if (avg >= 1.0) {
-      log(severity, LD_GENERAL,
+      tor_log(severity, LD_GENERAL,
           " * Channel listener " U64_FORMAT " has averaged %f incoming "
           "channels per second",
           U64_PRINTF_ARG(chan_l->global_identifier), avg);
     } else if (avg >= 0.0) {
       interval = 1.0 / avg;
-      log(severity, LD_GENERAL,
+      tor_log(severity, LD_GENERAL,
           " * Channel listener " U64_FORMAT " has averaged %f seconds "
           "between incoming channels",
           U64_PRINTF_ARG(chan_l->global_identifier), interval);
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index b8f71bd342..8a378c0a0c 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -783,7 +783,7 @@ circuit_dump_conn_details(int severity,
                           int this_circid,
                           int other_circid)
 {
-  log(severity, LD_CIRC, "Conn %d has %s circuit: circID %d (other side %d), "
+  tor_log(severity, LD_CIRC, "Conn %d has %s circuit: circID %d (other side %d), "
       "state %d (%s), born %ld:",
       conn_array_index, type, this_circid, other_circid, circ->state,
       circuit_state_to_string(circ->state),
@@ -846,7 +846,7 @@ circuit_dump_chan_details(int severity,
                           int this_circid,
                           int other_circid)
 {
-  log(severity, LD_CIRC, "Conn %p has %s circuit: circID %d (other side %d), "
+  tor_log(severity, LD_CIRC, "Conn %p has %s circuit: circID %d (other side %d), "
       "state %d (%s), born %ld:",
       chan, type, this_circid, other_circid, circ->state,
       circuit_state_to_string(circ->state),
@@ -1343,7 +1343,7 @@ circuit_mark_for_close_(circuit_t *circ, int reason, int line,
   tor_assert(file);
 
   if (circ->marked_for_close) {
-    log(LOG_WARN,LD_BUG,
+    log_warn(LD_BUG,
         "Duplicate call to circuit_mark_for_close at %s:%d"
         " (first at %s:%d)", file, line,
         circ->marked_for_close_file, circ->marked_for_close);
diff --git a/src/or/config.c b/src/or/config.c
index dcd053ff62..74b635e850 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1092,7 +1092,7 @@ options_act_reversible(const or_options_t *old_options, char **msg)
 
   mark_logs_temp(); /* Close current logs once new logs are open. */
   logs_marked = 1;
-  if (options_init_logs(options, 0)<0) { /* Configure the log(s) */
+  if (options_init_logs(options, 0)<0) { /* Configure the tor_log(s) */
     *msg = tor_strdup("Failed to init Log options. See logs for details.");
     goto rollback;
   }
@@ -1268,7 +1268,7 @@ options_act(const or_options_t *old_options)
     return -1;
 
 #ifdef NON_ANONYMOUS_MODE_ENABLED
-  log(LOG_WARN, LD_GENERAL, "This copy of Tor was compiled to run in a "
+  log_warn(LD_GENERAL, "This copy of Tor was compiled to run in a "
       "non-anonymous mode. It will provide NO ANONYMITY.");
 #endif
 
@@ -1770,7 +1770,7 @@ config_get_commandlines(int argc, char **argv, config_line_t **result)
     (*new)->value = want_arg ? tor_strdup(argv[i+1]) : tor_strdup("");
     (*new)->command = command;
     (*new)->next = NULL;
-    log(LOG_DEBUG, LD_CONFIG, "command line: parsed keyword '%s', value '%s'",
+    log_debug(LD_CONFIG, "command line: parsed keyword '%s', value '%s'",
         (*new)->key, (*new)->value);
 
     new = &((*new)->next);
@@ -2218,7 +2218,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
   int n_ports=0;
 #define REJECT(arg) \
   STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END
-#define COMPLAIN(arg) STMT_BEGIN log(LOG_WARN, LD_CONFIG, arg); STMT_END
+#define COMPLAIN(arg) STMT_BEGIN log_warn(LD_CONFIG, arg); STMT_END
 
   tor_assert(msg);
   *msg = NULL;
@@ -2227,7 +2227,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
       (!strcmpstart(uname, "Windows 95") ||
        !strcmpstart(uname, "Windows 98") ||
        !strcmpstart(uname, "Windows Me"))) {
-    log(LOG_WARN, LD_CONFIG, "Tor is running as a server, but you are "
+    log_warn(LD_CONFIG, "Tor is running as a server, but you are "
         "running %s; this probably won't work. See "
         "https://wiki.torproject.org/TheOnionRouter/TorFAQ#ServerOS "
         "for details.", uname);
@@ -2256,7 +2256,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
   }
 
   if (server_mode(options) && !options->ContactInfo)
-    log(LOG_NOTICE, LD_CONFIG, "Your ContactInfo config option is not set. "
+    log_notice(LD_CONFIG, "Your ContactInfo config option is not set. "
         "Please consider setting it, so we can contact you if your server is "
         "misconfigured or something else goes wrong.");
 
@@ -2268,7 +2268,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
         config_line_append(&options->Logs, "Log", "warn stdout");
   }
 
-  if (options_init_logs(options, 1)<0) /* Validate the log(s) */
+  if (options_init_logs(options, 1)<0) /* Validate the tor_log(s) */
     REJECT("Failed to validate Log options. See logs for details.");
 
   if (authdir_mode(options)) {
@@ -2286,7 +2286,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
   /* XXXX require that the only port not be DirPort? */
   /* XXXX require that at least one port be listened-upon. */
   if (n_ports == 0 && !options->RendConfigLines)
-    log(LOG_WARN, LD_CONFIG,
+    log_warn(LD_CONFIG,
         "SocksPort, TransPort, NATDPort, DNSPort, and ORPort are all "
         "undefined, and there aren't any hidden services configured.  "
         "Tor will still run, but probably won't do anything.");
@@ -2446,7 +2446,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
       });
       new_line->value = smartlist_join_strings(instead,",",0,NULL);
       /* These have been deprecated since 0.1.1.5-alpha-cvs */
-      log(LOG_NOTICE, LD_CONFIG,
+      log_notice(LD_CONFIG,
           "Converting FascistFirewall and FirewallPorts "
           "config options to new format: \"ReachableAddresses %s\"",
           new_line->value);
@@ -2461,7 +2461,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
         new_line->key = tor_strdup("ReachableDirAddresses");
         new_line->value = tor_strdup("*:80");
         options->ReachableDirAddresses = new_line;
-        log(LOG_NOTICE, LD_CONFIG, "Converting FascistFirewall config option "
+        log_notice(LD_CONFIG, "Converting FascistFirewall config option "
             "to new format: \"ReachableDirAddresses *:80\"");
       }
       if (!options->ReachableORAddresses) {
@@ -2469,7 +2469,7 @@ options_validate(or_options_t *old_options, or_options_t *options,
         new_line->key = tor_strdup("ReachableORAddresses");
         new_line->value = tor_strdup("*:443");
         options->ReachableORAddresses = new_line;
-        log(LOG_NOTICE, LD_CONFIG, "Converting FascistFirewall config option "
+        log_notice(LD_CONFIG, "Converting FascistFirewall config option "
             "to new format: \"ReachableORAddresses *:443\"");
       }
     }
@@ -3423,7 +3423,7 @@ find_torrc_filename(int argc, char **argv,
   for (i = 1; i < argc; ++i) {
     if (i < argc-1 && !strcmp(argv[i],fname_opt)) {
       if (fname) {
-        log(LOG_WARN, LD_CONFIG, "Duplicate %s options on command line.",
+        log_warn(LD_CONFIG, "Duplicate %s options on command line.",
             fname_opt);
         tor_free(fname);
       }
@@ -3486,7 +3486,7 @@ load_torrc_from_disk(int argc, char **argv, int defaults_file)
   fname = find_torrc_filename(argc, argv, defaults_file,
                               &using_default_torrc, &ignore_missing_torrc);
   tor_assert(fname);
-  log(LOG_DEBUG, LD_CONFIG, "Opening config file \"%s\"", fname);
+  log_debug(LD_CONFIG, "Opening config file \"%s\"", fname);
 
   tor_free(*fname_var);
   *fname_var = fname;
@@ -3496,18 +3496,18 @@ load_torrc_from_disk(int argc, char **argv, int defaults_file)
       !(cf = read_file_to_str(fname,0,NULL))) {
     if (using_default_torrc == 1 || ignore_missing_torrc) {
       if (!defaults_file)
-        log(LOG_NOTICE, LD_CONFIG, "Configuration file \"%s\" not present, "
+        log_notice(LD_CONFIG, "Configuration file \"%s\" not present, "
             "using reasonable defaults.", fname);
       tor_free(fname); /* sets fname to NULL */
       *fname_var = NULL;
       cf = tor_strdup("");
     } else {
-      log(LOG_WARN, LD_CONFIG,
+      log_warn(LD_CONFIG,
           "Unable to open configuration file \"%s\".", fname);
       goto err;
     }
   } else {
-    log(LOG_NOTICE, LD_CONFIG, "Read configuration file \"%s\".", fname);
+    log_notice(LD_CONFIG, "Read configuration file \"%s\".", fname);
   }
 
   return cf;
@@ -3599,7 +3599,7 @@ options_init_from_torrc(int argc, char **argv)
   tor_free(cf);
   tor_free(cf_defaults);
   if (errmsg) {
-    log(LOG_WARN,LD_CONFIG,"%s", errmsg);
+    log_warn(LD_CONFIG,"%s", errmsg);
     tor_free(errmsg);
   }
   return retval < 0 ? -1 : 0;
@@ -5383,7 +5383,7 @@ check_server_ports(const smartlist_t *ports,
   }
 
   if (n_low_port && options->AccountingMax) {
-    log(LOG_WARN, LD_CONFIG,
+    log_warn(LD_CONFIG,
           "You have set AccountingMax to use hibernation. You have also "
           "chosen a low DirPort or OrPort. This combination can make Tor stop "
           "working when it tries to re-attach the port after a period of "
diff --git a/src/or/connection.c b/src/or/connection.c
index b3719151f0..c1cfbd61f7 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -731,7 +731,7 @@ connection_mark_for_close_internal_(connection_t *conn,
   tor_assert(file);
 
   if (conn->marked_for_close) {
-    log(LOG_WARN,LD_BUG,"Duplicate call to connection_mark_for_close at %s:%d"
+    log_warn(LD_BUG,"Duplicate call to connection_mark_for_close at %s:%d"
         " (first at %s:%d)", file, line, conn->marked_for_close_file,
         conn->marked_for_close);
     tor_fragile_assert();
@@ -2530,7 +2530,7 @@ connection_bucket_refill_helper(int *bucket, int rate, int burst,
         *bucket = burst;
       }
     }
-    log(LOG_DEBUG, LD_NET,"%s now %d.", name, *bucket);
+    log_debug(LD_NET,"%s now %d.", name, *bucket);
   }
 }
 
@@ -3897,7 +3897,7 @@ client_check_address_changed(tor_socket_t sock)
   } else {
     /* The interface changed.  We're a client, so we need to regenerate our
      * keys.  First, reset the state. */
-    log(LOG_NOTICE, LD_NET, "Our IP address has changed.  Rotating keys...");
+    log_notice(LD_NET, "Our IP address has changed.  Rotating keys...");
     tor_addr_copy(*last_interface_ip_ptr, &iface_addr);
     SMARTLIST_FOREACH(outgoing_addrs, tor_addr_t*, a_ptr, tor_free(a_ptr));
     smartlist_clear(outgoing_addrs);
@@ -4109,14 +4109,14 @@ connection_dump_buffer_mem_stats(int severity)
     total_alloc += alloc_by_type[i];
   }
 
-  log(severity, LD_GENERAL,
+  tor_log(severity, LD_GENERAL,
      "In buffers for %d connections: "U64_FORMAT" used/"U64_FORMAT" allocated",
       smartlist_len(conns),
       U64_PRINTF_ARG(total_used), U64_PRINTF_ARG(total_alloc));
   for (i=CONN_TYPE_MIN_; i <= CONN_TYPE_MAX_; ++i) {
     if (!n_conns_by_type[i])
       continue;
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "  For %d %s connections: "U64_FORMAT" used/"U64_FORMAT" allocated",
         n_conns_by_type[i], conn_type_to_string(i),
         U64_PRINTF_ARG(used_by_type[i]), U64_PRINTF_ARG(alloc_by_type[i]));
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 872decba11..5ec32d6324 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -295,13 +295,13 @@ connection_or_report_broken_states(int severity, int domain)
 
   smartlist_sort(items, broken_state_count_compare);
 
-  log(severity, domain, "%d connections have failed%s", total,
+  tor_log(severity, domain, "%d connections have failed%s", total,
       smartlist_len(items) > MAX_REASONS_TO_REPORT ? ". Top reasons:" : ":");
 
   SMARTLIST_FOREACH_BEGIN(items, const broken_state_count_t *, c) {
     if (c_sl_idx > MAX_REASONS_TO_REPORT)
       break;
-    log(severity, domain,
+    tor_log(severity, domain,
         " %d connections died in state %s", (int)c->count, c->state);
   } SMARTLIST_FOREACH_END(c);
 
diff --git a/src/or/control.c b/src/or/control.c
index 54e5c597a1..9ab0dafb7b 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -4663,7 +4663,7 @@ control_event_bootstrap(bootstrap_status_t status, int progress)
   if (status > bootstrap_percent ||
       (progress && progress > bootstrap_percent)) {
     bootstrap_status_to_string(status, &tag, &summary);
-    log(status ? LOG_NOTICE : LOG_INFO, LD_CONTROL,
+    tor_log(status ? LOG_NOTICE : LOG_INFO, LD_CONTROL,
         "Bootstrapped %d%%: %s.", progress ? progress : status, summary);
     tor_snprintf(buf, sizeof(buf),
         "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"",
diff --git a/src/or/directory.c b/src/or/directory.c
index c68a4e3b22..c101418446 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1860,7 +1860,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
     const char *flavname = conn->requested_resource;
     if (status_code != 200) {
       int severity = (status_code == 304) ? LOG_INFO : LOG_WARN;
-      log(severity, LD_DIR,
+      tor_log(severity, LD_DIR,
           "Received http status code %d (%s) from server "
           "'%s:%d' while fetching consensus directory.",
            status_code, escaped(reason), conn->base_.address,
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 8af848ca02..e2cd7cfd26 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2017,7 +2017,7 @@ dirserv_compute_performance_thresholds(routerlist_t *rl)
       median_uint32(bandwidths_excluding_exits, n_active_nonexit);
   }
 
-  log(LOG_INFO, LD_DIRSERV,
+  log_info(LD_DIRSERV,
       "Cutoffs: For Stable, %lu sec uptime, %lu sec MTBF. "
       "For Fast: %lu bytes/sec. "
       "For Guard: WFU %.03f%%, time-known %lu sec, "
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 0731426d97..aee9a6edfe 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -2288,7 +2288,7 @@ networkstatus_add_detached_signatures(networkstatus_t *target,
     if (sig->good_signature || !old_sig || old_sig->bad_signature) {
       log_info(LD_DIR, "Adding signature from %s with %s", voter_identity,
                algorithm);
-      log(severity, LD_DIR, "Added a signature for %s from %s.",
+      tor_log(severity, LD_DIR, "Added a signature for %s from %s.",
           target_voter->nickname, source);
       ++r;
       if (old_sig) {
diff --git a/src/or/dns.c b/src/or/dns.c
index 68309a80df..edcf92e5b3 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -262,7 +262,7 @@ evdns_log_cb(int warn, const char *msg)
   int severity = warn ? LOG_WARN : LOG_INFO;
   if (!strcmpstart(msg, "Resolve requested for") &&
       get_options()->SafeLogging) {
-    log(LOG_INFO, LD_EXIT, "eventdns: Resolve requested.");
+    log_info(LD_EXIT, "eventdns: Resolve requested.");
     return;
   } else if (!strcmpstart(msg, "Search: ")) {
     return;
@@ -291,7 +291,7 @@ evdns_log_cb(int warn, const char *msg)
     control_event_server_status(LOG_WARN, "NAMESERVER_ALL_DOWN");
     all_down = 1;
   }
-  log(severity, LD_EXIT, "eventdns: %s", msg);
+  tor_log(severity, LD_EXIT, "eventdns: %s", msg);
 }
 
 /** Helper: passed to eventdns.c as a callback so it can generate random
@@ -835,7 +835,7 @@ dns_resolve_impl(edge_connection_t *exitconn, int is_resolve,
     return -1;
 
   if (address_is_invalid_destination(exitconn->base_.address, 0)) {
-    log(LOG_PROTOCOL_WARN, LD_EXIT,
+    tor_log(LOG_PROTOCOL_WARN, LD_EXIT,
         "Rejecting invalid destination address %s",
         escaped_safe_str(exitconn->base_.address));
     return -1;
@@ -1844,7 +1844,7 @@ wildcard_increment_answer(const char *id)
   if (*ip > 5 && n_wildcard_requests > 10) {
     if (!dns_wildcard_list) dns_wildcard_list = smartlist_new();
     if (!smartlist_contains_string(dns_wildcard_list, id)) {
-    log(dns_wildcard_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
+    tor_log(dns_wildcard_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
         "Your DNS provider has given \"%s\" as an answer for %d different "
         "invalid addresses. Apparently they are hijacking DNS failures. "
         "I'll try to correct for this by treating future occurrences of "
@@ -1876,7 +1876,7 @@ add_wildcarded_test_address(const char *address)
   smartlist_add(dns_wildcarded_test_address_list, tor_strdup(address));
   n = smartlist_len(dns_wildcarded_test_address_list);
   if (n > n_test_addrs/2) {
-    log(dns_wildcarded_test_address_notice_given ? LOG_INFO : LOG_NOTICE,
+    tor_log(dns_wildcarded_test_address_notice_given ? LOG_INFO : LOG_NOTICE,
         LD_EXIT, "Your DNS provider tried to redirect \"%s\" to a junk "
         "address.  It has done this with %d test addresses so far.  I'm "
         "going to stop being an exit node for now, since our DNS seems so "
@@ -1920,7 +1920,7 @@ evdns_wildcard_check_callback(int result, char type, int count, int ttl,
       }
     }
 
-    log(dns_wildcard_one_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
+    tor_log(dns_wildcard_one_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
         "Your DNS provider gave an answer for \"%s\", which "
         "is not supposed to exist. Apparently they are hijacking "
         "DNS failures. Trying to correct for this. We've noticed %d "
@@ -2151,8 +2151,8 @@ dump_dns_mem_usage(int severity)
   /* Print out the count and estimated size of our &cache_root.  It undercounts
      hostnames in cached reverse resolves.
    */
-  log(severity, LD_MM, "Our DNS cache has %d entries.", hash_count);
-  log(severity, LD_MM, "Our DNS cache size is approximately %u bytes.",
+  tor_log(severity, LD_MM, "Our DNS cache has %d entries.", hash_count);
+  tor_log(severity, LD_MM, "Our DNS cache size is approximately %u bytes.",
       (unsigned)hash_mem);
 }
 
diff --git a/src/or/main.c b/src/or/main.c
index 3cdfe8acf7..79b0f25778 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -973,7 +973,7 @@ directory_info_has_arrived(time_t now, int from_cache)
   if (!router_have_minimum_dir_info()) {
     int quiet = from_cache ||
                 directory_too_idle_to_fetch_descriptors(options, now);
-    log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
+    tor_log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
         "I learned some more directory information, but not enough to "
         "build a circuit: %s", get_dir_info_status_string());
     update_all_descriptor_downloads(now);
@@ -1201,7 +1201,7 @@ run_scheduled_events(time_t now)
    * eventually. */
   if (signewnym_is_pending &&
       time_of_last_signewnym + MAX_SIGNEWNYM_RATE <= now) {
-    log(LOG_INFO, LD_CONTROL, "Honoring delayed NEWNYM request");
+    log_info(LD_CONTROL, "Honoring delayed NEWNYM request");
     signewnym_impl(now);
   }
 
@@ -2083,7 +2083,7 @@ process_signal(uintptr_t sig)
       time_t now = time(NULL);
       if (time_of_last_signewnym + MAX_SIGNEWNYM_RATE > now) {
         signewnym_is_pending = 1;
-        log(LOG_NOTICE, LD_CONTROL,
+        log_notice(LD_CONTROL,
             "Rate limiting NEWNYM request: delaying by %d second(s)",
             (int)(MAX_SIGNEWNYM_RATE+time_of_last_signewnym-now));
       } else {
@@ -2115,7 +2115,7 @@ static void
 dumpmemusage(int severity)
 {
   connection_dump_buffer_mem_stats(severity);
-  log(severity, LD_GENERAL, "In rephist: "U64_FORMAT" used by %d Tors.",
+  tor_log(severity, LD_GENERAL, "In rephist: "U64_FORMAT" used by %d Tors.",
       U64_PRINTF_ARG(rephist_total_alloc), rephist_total_num);
   dump_routerlist_mem_usage(severity);
   dump_cell_pool_usage(severity);
@@ -2133,27 +2133,27 @@ dumpstats(int severity)
   time_t elapsed;
   size_t rbuf_cap, wbuf_cap, rbuf_len, wbuf_len;
 
-  log(severity, LD_GENERAL, "Dumping stats:");
+  tor_log(severity, LD_GENERAL, "Dumping stats:");
 
   SMARTLIST_FOREACH_BEGIN(connection_array, connection_t *, conn) {
     int i = conn_sl_idx;
-    log(severity, LD_GENERAL,
+    tor_log(severity, LD_GENERAL,
         "Conn %d (socket %d) type %d (%s), state %d (%s), created %d secs ago",
         i, (int)conn->s, conn->type, conn_type_to_string(conn->type),
         conn->state, conn_state_to_string(conn->type, conn->state),
         (int)(now - conn->timestamp_created));
     if (!connection_is_listener(conn)) {
-      log(severity,LD_GENERAL,
+      tor_log(severity,LD_GENERAL,
           "Conn %d is to %s:%d.", i,
           safe_str_client(conn->address),
           conn->port);
-      log(severity,LD_GENERAL,
+      tor_log(severity,LD_GENERAL,
           "Conn %d: %d bytes waiting on inbuf (len %d, last read %d secs ago)",
           i,
           (int)connection_get_inbuf_len(conn),
           (int)buf_allocation(conn->inbuf),
           (int)(now - conn->timestamp_lastread));
-      log(severity,LD_GENERAL,
+      tor_log(severity,LD_GENERAL,
           "Conn %d: %d bytes waiting on outbuf "
           "(len %d, last written %d secs ago)",i,
           (int)connection_get_outbuf_len(conn),
@@ -2164,7 +2164,7 @@ dumpstats(int severity)
         if (or_conn->tls) {
           tor_tls_get_buffer_sizes(or_conn->tls, &rbuf_cap, &rbuf_len,
                                    &wbuf_cap, &wbuf_len);
-          log(severity, LD_GENERAL,
+          tor_log(severity, LD_GENERAL,
               "Conn %d: %d/%d bytes used on OpenSSL read buffer; "
               "%d/%d bytes used on write buffer.",
               i, (int)rbuf_len, (int)rbuf_cap, (int)wbuf_len, (int)wbuf_cap);
@@ -2178,7 +2178,7 @@ dumpstats(int severity)
   channel_dumpstats(severity);
   channel_listener_dumpstats(severity);
 
-  log(severity, LD_NET,
+  tor_log(severity, LD_NET,
       "Cells processed: "U64_FORMAT" padding\n"
       "                 "U64_FORMAT" create\n"
       "                 "U64_FORMAT" created\n"
@@ -2194,11 +2194,11 @@ dumpstats(int severity)
       U64_PRINTF_ARG(stats_n_relay_cells_delivered),
       U64_PRINTF_ARG(stats_n_destroy_cells_processed));
   if (stats_n_data_cells_packaged)
-    log(severity,LD_NET,"Average packaged cell fullness: %2.3f%%",
+    tor_log(severity,LD_NET,"Average packaged cell fullness: %2.3f%%",
         100*(U64_TO_DBL(stats_n_data_bytes_packaged) /
              U64_TO_DBL(stats_n_data_cells_packaged*RELAY_PAYLOAD_SIZE)) );
   if (stats_n_data_cells_received)
-    log(severity,LD_NET,"Average delivered cell fullness: %2.3f%%",
+    tor_log(severity,LD_NET,"Average delivered cell fullness: %2.3f%%",
         100*(U64_TO_DBL(stats_n_data_bytes_received) /
              U64_TO_DBL(stats_n_data_cells_received*RELAY_PAYLOAD_SIZE)) );
 
@@ -2211,19 +2211,19 @@ dumpstats(int severity)
     elapsed = 0;
 
   if (elapsed) {
-    log(severity, LD_NET,
+    tor_log(severity, LD_NET,
         "Average bandwidth: "U64_FORMAT"/%d = %d bytes/sec reading",
         U64_PRINTF_ARG(stats_n_bytes_read),
         (int)elapsed,
         (int) (stats_n_bytes_read/elapsed));
-    log(severity, LD_NET,
+    tor_log(severity, LD_NET,
         "Average bandwidth: "U64_FORMAT"/%d = %d bytes/sec writing",
         U64_PRINTF_ARG(stats_n_bytes_written),
         (int)elapsed,
         (int) (stats_n_bytes_written/elapsed));
   }
 
-  log(severity, LD_NET, "--------------- Dumping memory information:");
+  tor_log(severity, LD_NET, "--------------- Dumping memory information:");
   dumpmemusage(severity);
 
   rep_hist_dump_stats(now,severity);
@@ -2364,7 +2364,7 @@ tor_init(int argc, char *argv[])
   }
 
 #ifdef NON_ANONYMOUS_MODE_ENABLED
-  log(LOG_WARN, LD_GENERAL, "This copy of Tor was compiled to run in a "
+  log_warn(LD_GENERAL, "This copy of Tor was compiled to run in a "
       "non-anonymous mode. It will provide NO ANONYMITY.");
 #endif
 
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 79dd706c47..b45d402ba7 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -561,7 +561,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
   if (warn >= 0) {
     SMARTLIST_FOREACH(unrecognized, networkstatus_voter_info_t *, voter,
       {
-        log(severity, LD_DIR, "Consensus includes unrecognized authority "
+        tor_log(severity, LD_DIR, "Consensus includes unrecognized authority "
                  "'%s' at %s:%d (contact %s; identity %s)",
                  voter->nickname, voter->address, (int)voter->dir_port,
                  voter->contact?voter->contact:"n/a",
@@ -569,7 +569,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
       });
     SMARTLIST_FOREACH(need_certs_from, networkstatus_voter_info_t *, voter,
       {
-        log(severity, LD_DIR, "Looks like we need to download a new "
+        tor_log(severity, LD_DIR, "Looks like we need to download a new "
                  "certificate from authority '%s' at %s:%d (contact %s; "
                  "identity %s)",
                  voter->nickname, voter->address, (int)voter->dir_port,
@@ -578,7 +578,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
       });
     SMARTLIST_FOREACH(missing_authorities, dir_server_t *, ds,
       {
-        log(severity, LD_DIR, "Consensus does not include configured "
+        tor_log(severity, LD_DIR, "Consensus does not include configured "
                  "authority '%s' at %s:%d (identity %s)",
                  ds->nickname, ds->address, (int)ds->dir_port,
                  hex_str(ds->v3_identity_digest, DIGEST_LEN));
@@ -614,7 +614,7 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus,
                       "because we were missing the keys.", n_missing_key);
       }
       joined = smartlist_join_strings(sl, " ", 0, NULL);
-      log(severity, LD_DIR, "%s", joined);
+      tor_log(severity, LD_DIR, "%s", joined);
       tor_free(joined);
       SMARTLIST_FOREACH(sl, char *, c, tor_free(c));
       smartlist_free(sl);
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index c2eb670e4d..9f77dcafed 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -1463,14 +1463,14 @@ update_router_have_minimum_dir_info(void)
 
  done:
   if (res && !have_min_dir_info) {
-    log(LOG_NOTICE, LD_DIR,
+    log_notice(LD_DIR,
         "We now have enough directory information to build circuits.");
     control_event_client_status(LOG_NOTICE, "ENOUGH_DIR_INFO");
     control_event_bootstrap(BOOTSTRAP_STATUS_CONN_OR, 0);
   }
   if (!res && have_min_dir_info) {
     int quiet = directory_too_idle_to_fetch_descriptors(options, now);
-    log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
+    tor_log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
         "Our directory information is no longer up-to-date "
         "enough to build circuits: %s", dir_info_status);
 
diff --git a/src/or/policies.c b/src/or/policies.c
index f9a03aef2c..9696b8123b 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -881,7 +881,7 @@ exit_policy_remove_redundancies(smartlist_t *dest)
         char p1[POLICY_BUF_LEN], p2[POLICY_BUF_LEN];
         policy_write_item(p1, sizeof(p1), tmp, 0);
         policy_write_item(p2, sizeof(p2), ap, 0);
-        log(LOG_DEBUG, LD_CONFIG, "Removing exit policy %s (%d).  It is made "
+        log_debug(LD_CONFIG, "Removing exit policy %s (%d).  It is made "
             "redundant by %s (%d).", p1, j, p2, i);
         smartlist_del_keeporder(dest, j--);
         addr_policy_free(tmp);
@@ -910,7 +910,7 @@ exit_policy_remove_redundancies(smartlist_t *dest)
           char p1[POLICY_BUF_LEN], p2[POLICY_BUF_LEN];
           policy_write_item(p1, sizeof(p1), ap, 0);
           policy_write_item(p2, sizeof(p2), tmp, 0);
-          log(LOG_DEBUG, LD_CONFIG, "Removing exit policy %s.  It is already "
+          log_debug(LD_CONFIG, "Removing exit policy %s.  It is already "
               "covered by %s.", p1, p2);
           smartlist_del_keeporder(dest, i--);
           addr_policy_free(ap);
diff --git a/src/or/relay.c b/src/or/relay.c
index f711eae92c..66b3089d62 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2023,7 +2023,7 @@ dump_cell_pool_usage(int severity)
       n_cells += TO_OR_CIRCUIT(c)->p_chan_cells.n;
     ++n_circs;
   }
-  log(severity, LD_MM, "%d cells allocated on %d circuits. %d cells leaked.",
+  tor_log(severity, LD_MM, "%d cells allocated on %d circuits. %d cells leaked.",
       n_cells, n_circs, total_cells_allocated - n_cells);
   mp_pool_log_status(cell_pool, severity);
 }
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index f115d8bfc8..f85ac2c03b 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3304,7 +3304,7 @@ rend_service_dump_stats(int severity)
 
   for (i=0; i < smartlist_len(rend_service_list); ++i) {
     service = smartlist_get(rend_service_list, i);
-    log(severity, LD_GENERAL, "Service configured in \"%s\":",
+    tor_log(severity, LD_GENERAL, "Service configured in \"%s\":",
         service->directory);
     for (j=0; j < smartlist_len(service->intro_nodes); ++j) {
       intro = smartlist_get(service->intro_nodes, j);
@@ -3312,11 +3312,11 @@ rend_service_dump_stats(int severity)
 
       circ = find_intro_circuit(intro, service->pk_digest);
       if (!circ) {
-        log(severity, LD_GENERAL, "  Intro point %d at %s: no circuit",
+        tor_log(severity, LD_GENERAL, "  Intro point %d at %s: no circuit",
             j, safe_name);
         continue;
       }
-      log(severity, LD_GENERAL, "  Intro point %d at %s: circuit is %s",
+      tor_log(severity, LD_GENERAL, "  Intro point %d at %s: circuit is %s",
           j, safe_name, circuit_state_to_string(circ->base_.state));
     }
   }
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 74d459f8a3..925ca88153 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -648,7 +648,7 @@ rep_hist_dump_stats(time_t now, int severity)
 
   rep_history_clean(now - get_options()->RephistTrackTime);
 
-  log(severity, LD_HIST, "--------------- Dumping history information:");
+  tor_log(severity, LD_HIST, "--------------- Dumping history information:");
 
   for (orhist_it = digestmap_iter_init(history_map);
        !digestmap_iter_done(orhist_it);
@@ -673,7 +673,7 @@ rep_hist_dump_stats(time_t now, int severity)
     } else {
       uptime=1.0;
     }
-    log(severity, LD_HIST,
+    tor_log(severity, LD_HIST,
         "OR %s [%s]: %ld/%ld good connections; uptime %ld/%ld sec (%.2f%%); "
         "wmtbf %lu:%02lu:%02lu",
         name1, hexdigest1,
@@ -707,7 +707,7 @@ rep_hist_dump_stats(time_t now, int severity)
         else
           len += ret;
       }
-      log(severity, LD_HIST, "%s", buffer);
+      tor_log(severity, LD_HIST, "%s", buffer);
     }
   }
 }
@@ -2042,7 +2042,7 @@ note_crypto_pk_op(pk_op_t operation)
 void
 dump_pk_ops(int severity)
 {
-  log(severity, LD_HIST,
+  tor_log(severity, LD_HIST,
       "PK operations: %lu directory objects signed, "
       "%lu directory objects verified, "
       "%lu routerdescs signed, "
diff --git a/src/or/router.c b/src/or/router.c
index c584d6277f..69d346f5ba 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -391,14 +391,14 @@ init_key_from_file(const char *fname, int generate, int severity)
   crypto_pk_t *prkey = NULL;
 
   if (!(prkey = crypto_pk_new())) {
-    log(severity, LD_GENERAL,"Error constructing key");
+    tor_log(severity, LD_GENERAL,"Error constructing key");
     goto error;
   }
 
   switch (file_status(fname)) {
     case FN_DIR:
     case FN_ERROR:
-      log(severity, LD_FS,"Can't read key from \"%s\"", fname);
+      tor_log(severity, LD_FS,"Can't read key from \"%s\"", fname);
       goto error;
     case FN_NOENT:
       if (generate) {
@@ -406,7 +406,7 @@ init_key_from_file(const char *fname, int generate, int severity)
           if (try_locking(get_options(), 0)<0) {
             /* Make sure that --list-fingerprint only creates new keys
              * if there is no possibility for a deadlock. */
-            log(severity, LD_FS, "Another Tor process has locked \"%s\". Not "
+            tor_log(severity, LD_FS, "Another Tor process has locked \"%s\". Not "
                 "writing any new keys.", fname);
             /*XXXX The 'other process' might make a key in a second or two;
              * maybe we should wait for it. */
@@ -416,16 +416,16 @@ init_key_from_file(const char *fname, int generate, int severity)
         log_info(LD_GENERAL, "No key found in \"%s\"; generating fresh key.",
                  fname);
         if (crypto_pk_generate_key(prkey)) {
-          log(severity, LD_GENERAL,"Error generating onion key");
+          tor_log(severity, LD_GENERAL,"Error generating onion key");
           goto error;
         }
         if (crypto_pk_check_key(prkey) <= 0) {
-          log(severity, LD_GENERAL,"Generated key seems invalid");
+          tor_log(severity, LD_GENERAL,"Generated key seems invalid");
           goto error;
         }
         log_info(LD_GENERAL, "Generated key seems valid");
         if (crypto_pk_write_private_key_to_filename(prkey, fname)) {
-          log(severity, LD_FS,
+          tor_log(severity, LD_FS,
               "Couldn't write generated key to \"%s\".", fname);
           goto error;
         }
@@ -435,7 +435,7 @@ init_key_from_file(const char *fname, int generate, int severity)
       return prkey;
     case FN_FILE:
       if (crypto_pk_read_private_key_from_filename(prkey, fname)) {
-        log(severity, LD_GENERAL,"Error loading private key.");
+        tor_log(severity, LD_GENERAL,"Error loading private key.");
         goto error;
       }
       return prkey;
@@ -465,7 +465,7 @@ init_curve25519_keypair_from_file(curve25519_keypair_t *keys_out,
   switch (file_status(fname)) {
     case FN_DIR:
     case FN_ERROR:
-      log(severity, LD_FS,"Can't read key from \"%s\"", fname);
+      tor_log(severity, LD_FS,"Can't read key from \"%s\"", fname);
       goto error;
     case FN_NOENT:
       if (generate) {
@@ -473,7 +473,7 @@ init_curve25519_keypair_from_file(curve25519_keypair_t *keys_out,
           if (try_locking(get_options(), 0)<0) {
             /* Make sure that --list-fingerprint only creates new keys
              * if there is no possibility for a deadlock. */
-            log(severity, LD_FS, "Another Tor process has locked \"%s\". Not "
+            tor_log(severity, LD_FS, "Another Tor process has locked \"%s\". Not "
                 "writing any new keys.", fname);
             /*XXXX The 'other process' might make a key in a second or two;
              * maybe we should wait for it. */
@@ -485,7 +485,7 @@ init_curve25519_keypair_from_file(curve25519_keypair_t *keys_out,
         if (curve25519_keypair_generate(keys_out, 1) < 0)
           goto error;
         if (curve25519_keypair_write_to_file(keys_out, fname, tag)<0) {
-          log(severity, LD_FS,
+          tor_log(severity, LD_FS,
               "Couldn't write generated key to \"%s\".", fname);
           memset(keys_out, 0, sizeof(*keys_out));
           goto error;
@@ -498,12 +498,12 @@ init_curve25519_keypair_from_file(curve25519_keypair_t *keys_out,
       {
         char *tag_in=NULL;
         if (curve25519_keypair_read_from_file(keys_out, &tag_in, fname) < 0) {
-          log(severity, LD_GENERAL,"Error loading private key.");
+          tor_log(severity, LD_GENERAL,"Error loading private key.");
           tor_free(tag_in);
           goto error;
         }
         if (!tag_in || strcmp(tag_in, tag)) {
-          log(severity, LD_GENERAL,"Unexpected tag %s on private key.",
+          tor_log(severity, LD_GENERAL,"Unexpected tag %s on private key.",
               escaped(tag_in));
           tor_free(tag_in);
           goto error;
@@ -631,13 +631,13 @@ v3_authority_check_key_expiry(void)
     return;
 
   if (time_left <= 0) {
-    log(badness, LD_DIR, "Your v3 authority certificate has expired."
+    tor_log(badness, LD_DIR, "Your v3 authority certificate has expired."
         " Generate a new one NOW.");
   } else if (time_left <= 24*60*60) {
-    log(badness, LD_DIR, "Your v3 authority certificate expires in %d hours;"
+    tor_log(badness, LD_DIR, "Your v3 authority certificate expires in %d hours;"
         " Generate a new one NOW.", time_left/(60*60));
   } else {
-    log(badness, LD_DIR, "Your v3 authority certificate expires in %d days;"
+    tor_log(badness, LD_DIR, "Your v3 authority certificate expires in %d days;"
         " Generate a new one soon.", time_left/(24*60*60));
   }
   last_warned = now;
@@ -902,7 +902,7 @@ init_keys(void)
   tor_free(cp);
   tor_free(keydir);
 
-  log(LOG_NOTICE, LD_GENERAL,
+  log_notice(LD_GENERAL,
       "Your Tor server's identity key fingerprint is '%s %s'",
       options->Nickname, fingerprint);
   if (!authdir_mode(options))
@@ -1062,10 +1062,10 @@ decide_to_advertise_dirport(const or_options_t *options, uint16_t dir_port)
 
   if (advertising != new_choice) {
     if (new_choice == 1) {
-      log(LOG_NOTICE, LD_DIR, "Advertising DirPort as %d", dir_port);
+      log_notice(LD_DIR, "Advertising DirPort as %d", dir_port);
     } else {
       tor_assert(reason);
-      log(LOG_NOTICE, LD_DIR, "Not advertising DirPort (Reason: %s)", reason);
+      log_notice(LD_DIR, "Not advertising DirPort (Reason: %s)", reason);
     }
     advertising = new_choice;
   }
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 5dd1a55dc5..3034f91f02 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -2647,7 +2647,7 @@ dump_routerlist_mem_usage(int severity)
   SMARTLIST_FOREACH(routerlist->old_routers, signed_descriptor_t *, sd,
                     olddescs += sd->signed_descriptor_len);
 
-  log(severity, LD_DIR,
+  tor_log(severity, LD_DIR,
       "In %d live descriptors: "U64_FORMAT" bytes.  "
       "In %d old descriptors: "U64_FORMAT" bytes.",
       smartlist_len(routerlist->routers), U64_PRINTF_ARG(livedescs),
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index b945ea6aa6..eaf015c0bc 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1029,7 +1029,7 @@ dump_distinct_digest_count(int severity)
 #ifdef COUNT_DISTINCT_DIGESTS
   if (!verified_digests)
     verified_digests = digestmap_new();
-  log(severity, LD_GENERAL, "%d *distinct* router digests verified",
+  tor_log(severity, LD_GENERAL, "%d *distinct* router digests verified",
       digestmap_size(verified_digests));
 #else
   (void)severity; /* suppress "unused parameter" warning */
diff --git a/src/or/routerset.c b/src/or/routerset.c
index 5154e28083..3a8cabacd0 100644
--- a/src/or/routerset.c
+++ b/src/or/routerset.c
@@ -95,7 +95,7 @@ routerset_refresh_countries(routerset_t *target)
       tor_assert(cc < target->n_countries);
       bitarray_set(target->countries, cc);
     } else {
-      log(LOG_WARN, LD_CONFIG, "Country code '%s' is not recognized.",
+      log_warn(LD_CONFIG, "Country code '%s' is not recognized.",
           country);
     }
   } SMARTLIST_FOREACH_END(country);
diff --git a/src/or/status.c b/src/or/status.c
index 97d0e49e01..126167dcb9 100644
--- a/src/or/status.c
+++ b/src/or/status.c
@@ -108,7 +108,7 @@ log_heartbeat(time_t now)
          uptime, count_circuits(),bw_sent,bw_rcvd);
 
   if (stats_n_data_cells_packaged)
-    log(LOG_NOTICE, LD_HEARTBEAT, "Average packaged cell fullness: %2.3f%%",
+    log_notice(LD_HEARTBEAT, "Average packaged cell fullness: %2.3f%%",
         100*(U64_TO_DBL(stats_n_data_bytes_packaged) /
              U64_TO_DBL(stats_n_data_cells_packaged*RELAY_PAYLOAD_SIZE)) );