From: Robert Ransom Date: Wed, 16 Feb 2011 12:12:37 +0000 (-0800) Subject: Don't crash a bridge authority on SIGHUP if it's not in the consensus X-Git-Tag: tor-0.2.1.31~7^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62c29a93ba78ad6ae91b87755ed8cc0283d27e56;p=thirdparty%2Ftor.git Don't crash a bridge authority on SIGHUP if it's not in the consensus Fixes bug 2572. --- diff --git a/changes/bug2572 b/changes/bug2572 new file mode 100644 index 0000000000..a5cca284a1 --- /dev/null +++ b/changes/bug2572 @@ -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. + + diff --git a/src/or/router.c b/src/or/router.c index c471599cb6..7354267a6f 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -615,7 +615,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. */