From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Dec 2009 22:26:09 +0000 (-0500)
Subject: Merge branch 'safelogging2'
X-Git-Tag: tor-0.2.2.7-alpha~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=350181529e39c5b9dcec7f1ae7edf15946fee501;p=thirdparty%2Ftor.git

Merge branch 'safelogging2'

Conflicts:
	ChangeLog
---

350181529e39c5b9dcec7f1ae7edf15946fee501
diff --cc ChangeLog
index c5451e1b82,165862db0d..fe32ab1580
--- a/ChangeLog
+++ b/ChangeLog
@@@ -4,9 -4,8 +4,11 @@@ Changes in version 0.2.2.7-alpha - 2009
        timeout schedule for how many seconds until we detach a stream from
        a circuit and try a new circuit. If your network is particularly
        slow, you might want to set this to a number like 60.
 +    - New controller command "getinfo config-text". It returns the
 +      contents that Tor would write if you send it a SAVECONF command,
 +      so the controller can write the file to disk itself.
+     - New options for SafeLogging to allow scrubbing only log messages
+       generated while acting as a relay.
  
    o Minor bugfixes:
      - Fix compilation on OSX 10.3, which has a stub mlockall() but
diff --cc src/or/rendcommon.c
index 6567f14140,43f9857573..5d18c6f64d
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@@ -843,9 -835,9 +844,9 @@@ rend_cache_clean_v2_descs_as_dir(void
        char key_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
        base32_encode(key_base32, sizeof(key_base32), key, DIGEST_LEN);
        log_info(LD_REND, "Removing descriptor with ID '%s' from cache",
-                safe_str(key_base32));
+                safe_str_client(key_base32));
        iter = digestmap_iter_next_rmv(rend_cache_v2_dir, iter);
 -      _rend_cache_entry_free(ent);
 +      rend_cache_entry_free(ent);
      } else {
        iter = digestmap_iter_next(rend_cache_v2_dir, iter);
      }