diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-03-19 17:20:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-03-19 17:20:37 -0400 |
| commit | d8893bc93c52e1edd0a76b81f5d65bb10d790474 (patch) | |
| tree | f6bb243d9fbeb179c7a5a3a79a19752ba970c98e /src/or/main.c | |
| parent | 3716611fea1c400e80ab3cfd19c588e32b1c005c (diff) | |
| parent | 1f8bd93ecbb57eb47c5788f4a4d12f3bdee61b47 (diff) | |
| download | tor-d8893bc93c52e1edd0a76b81f5d65bb10d790474.tar.gz tor-d8893bc93c52e1edd0a76b81f5d65bb10d790474.zip | |
Merge remote-tracking branch 'isis/bug23881_r1'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/or/main.c b/src/or/main.c index 65340751ef..a0d2ae0757 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -133,7 +133,7 @@ void evdns_shutdown(int); #ifdef HAVE_RUST // helper function defined in Rust to output a log message indicating if tor is // running with Rust enabled. See src/rust/tor_util -char *rust_welcome_string(void); +void rust_log_welcome_string(void); #endif /********* PROTOTYPES **********/ @@ -3344,11 +3344,7 @@ tor_init(int argc, char *argv[]) } #ifdef HAVE_RUST - char *rust_str = rust_welcome_string(); - if (rust_str != NULL && strlen(rust_str) > 0) { - log_notice(LD_GENERAL, "%s", rust_str); - } - tor_free(rust_str); + rust_log_welcome_string(); #endif /* defined(HAVE_RUST) */ if (network_init()<0) { |