nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-02-22 01:03:06 -05:00
commit d120ee1c63
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug2572 Normal file
View 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.

2
src/or/router.c
View File

@ -631,7 +631,7 @@ init_keys(void)
/* 4. Build our router descriptor. */ /* 4. Build our router descriptor. */
/* Must be called after keys are initialized. */ /* Must be called after keys are initialized. */
mydesc = router_get_my_descriptor(); mydesc = router_get_my_descriptor();
if (authdir_mode(options)) { if (authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL)) {
const char *m = NULL; const char *m = NULL;
routerinfo_t *ri; routerinfo_t *ri;
/* We need to add our own fingerprint so it gets recognized. */ /* We need to add our own fingerprint so it gets recognized. */