Commit c775689e authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'tor-github/pr/244'

parents 61d5bcc1 dddc9a17

changes/bug26882

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (logging, documentation):

    - When SafeLogging is enabled, scrub IP address in

      channel_tls_process_netinfo_cell(). Also, add a note

      to manpage that scrubbing is not guaranteed on loglevels

      below Notice. Fixes bug 26882; bugfix on 0.2.4.10-alpha.

doc/tor.1.txt

+3 −1
Original line number Diff line number Diff line
@@ -754,7 +754,9 @@ GENERAL OPTIONS 
    If this option is set to 0, Tor will not perform any scrubbing, if it is

    set to 1, all potentially sensitive strings are replaced. If it is set to

    relay, all log messages generated when acting as a relay are sanitized, but

    all messages generated when acting as a client are not. (Default: 1)

    all messages generated when acting as a client are not.

    Note: Tor may not heed this option when logging at log levels below Notice.

    (Default: 1)



[[User]] **User** __Username__::

    On startup, setuid to this user and setgid to their primary group.

src/core/or/channeltls.c

+2 −1
Original line number Diff line number Diff line
@@ -1837,7 +1837,8 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) 
             (int)(chan->conn->link_proto),

             hex_str(identity_digest, DIGEST_LEN),

             tor_addr_is_null(&my_apparent_addr) ?

             "<none>" : fmt_and_decorate_addr(&my_apparent_addr));

               "<none>" :

               safe_str_client(fmt_and_decorate_addr(&my_apparent_addr)));

  }

  assert_connection_ok(TO_CONN(chan->conn),time(NULL));

}