diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-10-20 17:36:06 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2021-10-20 17:36:06 +0000 |
| commit | 46de5eb054cfdcedad0f7971d9a0defbd5e21db0 (patch) | |
| tree | 05ead877a142912facbc9a41abe181d0fbcba28d | |
| parent | a9913435bc66e5f0ec539c9ce6f72a3e52aa4f08 (diff) | |
| parent | 5a043825d0b208343da4864ec9e071118b83cd06 (diff) | |
| download | tor-46de5eb054cfdcedad0f7971d9a0defbd5e21db0.tar.gz tor-46de5eb054cfdcedad0f7971d9a0defbd5e21db0.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rw-r--r-- | changes/bug40371 | 6 | ||||
| -rw-r--r-- | src/feature/relay/dns.c | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/changes/bug40371 b/changes/bug40371 new file mode 100644 index 0000000000..8cc7117f9f --- /dev/null +++ b/changes/bug40371 @@ -0,0 +1,6 @@ + o Minor bugfixes (compatibility): + - Fix compatibility with the most recent Libevent versions, which + no longer have an evdns_set_random_bytes() function. Because + this function has been a no-op since Libevent 2.0.4-alpha, + it is safe for us to just stop calling it. Fixes bug 40371; + bugfix on 0.2.1.7-alpha. diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index e20a39482f..49ed8bd790 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -211,20 +211,11 @@ evdns_log_cb(int warn, const char *msg) tor_log(severity, LD_EXIT, "eventdns: %s", msg); } -/** Helper: passed to eventdns.c as a callback so it can generate random - * numbers for transaction IDs and 0x20-hack coding. */ -static void -dns_randfn_(char *b, size_t n) -{ - crypto_rand(b,n); -} - /** Initialize the DNS subsystem; called by the OR process. */ int dns_init(void) { init_cache_map(); - evdns_set_random_bytes_fn(dns_randfn_); if (server_mode(get_options())) { int r = configure_nameservers(1); return r; |