mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-21 05:26:20 +02:00
Merge remote branch 'origin/maint-0.2.2'
This commit is contained in:
commit
d120ee1c63
5
changes/bug2572
Normal file
5
changes/bug2572
Normal file
@ -0,0 +1,5 @@
|
||||
o Minor bugfixes:
|
||||
- Don't crash a bridge authority on SIGHUP if it can't force itself
|
||||
into its routerlist. Fixes bug 2572.
|
||||
|
||||
|
@ -631,7 +631,7 @@ init_keys(void)
|
||||
/* 4. Build our router descriptor. */
|
||||
/* Must be called after keys are initialized. */
|
||||
mydesc = router_get_my_descriptor();
|
||||
if (authdir_mode(options)) {
|
||||
if (authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL)) {
|
||||
const char *m = NULL;
|
||||
routerinfo_t *ri;
|
||||
/* We need to add our own fingerprint so it gets recognized. */
|
||||
|
Loading…
Reference in New Issue
Block a user