diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-03-01 09:21:34 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-03-01 09:21:34 -0500 |
| commit | a0a4f8ae5d94a667ad431e487e08bc935a6989b5 (patch) | |
| tree | 420e147a41e0438fbd54830ea9aa47ce17ca6fff | |
| parent | 10ccb2bb4be39504dcd309108a37a824e3f37c48 (diff) | |
| parent | 931948ac6ad0c6f5327fd3c212ce6fe241a071f1 (diff) | |
| download | tor-a0a4f8ae5d94a667ad431e487e08bc935a6989b5.tar.gz tor-a0a4f8ae5d94a667ad431e487e08bc935a6989b5.zip | |
Merge remote-tracking branch 'asn/bug21586'
| -rw-r--r-- | changes/bug21586 | 4 | ||||
| -rw-r--r-- | src/or/main.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug21586 b/changes/bug21586 new file mode 100644 index 0000000000..200d55a8e8 --- /dev/null +++ b/changes/bug21586 @@ -0,0 +1,4 @@ + o Minor bugfix (directory authority): + - Prevent the shared randomness subsystem from asserting when initialized + by a bridge authority with an incomplete configuration file. Fixes bug + #21856; bugfix on 0.2.9.8. diff --git a/src/or/main.c b/src/or/main.c index 5549f97998..475587eacd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2405,7 +2405,7 @@ do_main_loop(void) } /* Setup shared random protocol subsystem. */ - if (authdir_mode_publishes_statuses(get_options())) { + if (authdir_mode_v3(get_options())) { if (sr_init(1) < 0) { return -1; } |