diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2011-02-16 04:12:37 -0800 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-10-26 22:09:44 +0200 |
| commit | 62c29a93ba78ad6ae91b87755ed8cc0283d27e56 (patch) | |
| tree | 062ca022fe4cf91b215a609857f3f3fdb1591871 | |
| parent | 908289894419b8fa331197948cb048f08ff5d035 (diff) | |
| download | tor-62c29a93ba78ad6ae91b87755ed8cc0283d27e56.tar.gz tor-62c29a93ba78ad6ae91b87755ed8cc0283d27e56.zip | |
Don't crash a bridge authority on SIGHUP if it's not in the consensus
Fixes bug 2572.
| -rw-r--r-- | changes/bug2572 | 5 | ||||
| -rw-r--r-- | src/or/router.c | 2 |
2 files changed, 6 insertions, 1 deletions
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. */ |