diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:47:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:47:18 -0400 |
| commit | 69ef94820b29500d93a8f2775764b8b96284bacb (patch) | |
| tree | 1337215f718c30da8cc8d1529c5a3a890e488316 /src/or/main.c | |
| parent | 92d335b3dcd7b302d8a07c105f9fe8a98848cad3 (diff) | |
| parent | 70c067102b7d2576fa456d2872bb41abf559dff6 (diff) | |
| download | tor-69ef94820b29500d93a8f2775764b8b96284bacb.tar.gz tor-69ef94820b29500d93a8f2775764b8b96284bacb.zip | |
Merge branch 'add_rust_squashed'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 398c4f63d2..2520a7e21d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -59,6 +59,7 @@ #include "circuitlist.h" #include "circuituse.h" #include "command.h" +#include "compat_rust.h" #include "compress.h" #include "config.h" #include "confparse.h" @@ -3073,6 +3074,15 @@ tor_init(int argc, char *argv[]) "Expect more bugs than usual."); } + { + rust_str_t rust_str = rust_welcome_string(); + const char *s = rust_str_get(rust_str); + if (strlen(s) > 0) { + log_notice(LD_GENERAL, "%s", s); + } + rust_str_free(rust_str); + } + if (network_init()<0) { log_err(LD_BUG,"Error initializing network; exiting."); return -1; |