Merge branch 'safelogging2'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index c5451e1b826af776c844f22b3bd9ea922c93c34a,165862db0dd409335f74b8a86f07795d2b727f4b..fe32ab1580828e4777ba5175a72246820611043e
--- 1/ChangeLog
--- 2/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/buffers.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc src/or/or.h
Simple merge

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

diff --cc src/or/rendcommon.c
index 6567f141403c148a52603b81d86e25cda65f8a12,43f9857573d54faa451dcb2d77336f0d5a6d043b..5d18c6f64d49849c31d5a6193686b17ec5909810
--- 1/src/or/rendcommon.c
--- 2/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);
      }

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