diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-15 15:59:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-15 15:59:10 -0500 |
| commit | 35423d397f9d4f7810e538b608ded47c33311026 (patch) | |
| tree | 61acc3efaad82b92b1752568a03a296738bf03fb /src/or/main.c | |
| parent | b3a69074933492080629d45b1c890606aa2bd08a (diff) | |
| parent | 1ad6dd0dbee7c757ef5f2f2d38b846ab7d991fb2 (diff) | |
| download | tor-35423d397f9d4f7810e538b608ded47c33311026.tar.gz tor-35423d397f9d4f7810e538b608ded47c33311026.zip | |
Merge branch 'bug4900_siphash_v2'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 959c41b641..a191d1c61b 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2319,6 +2319,13 @@ tor_init(int argc, char *argv[]) /* Have the log set up with our application name. */ tor_snprintf(progname, sizeof(progname), "Tor %s", get_version()); log_set_application_name(progname); + + /* Set up the crypto nice and early */ + if (crypto_early_init() < 0) { + log_err(LD_GENERAL, "Unable to initialize the crypto subsystem!"); + return 1; + } + /* Initialize the history structures. */ rep_hist_init(); /* Initialize the service cache. */ |