diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-03 14:05:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-03 14:05:26 -0400 |
| commit | 4bbdebff3fc47755df233a1720fbab81eb1cc344 (patch) | |
| tree | 775eb06f9d2841618cc4a8dc7cc66ebe101d15c9 /src | |
| parent | a49fb1e2e5ebb03d7d115b4a4eaa1c17c160f1a8 (diff) | |
| parent | 9228db5f1bee0b715b73ba6f8c11f5eb77d59f62 (diff) | |
| download | tor-4bbdebff3fc47755df233a1720fbab81eb1cc344.tar.gz tor-4bbdebff3fc47755df233a1720fbab81eb1cc344.zip | |
Merge remote-tracking branch 'arma/bug20277'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/directory.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 52b14b9bae..1f894d9fb3 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -495,9 +495,6 @@ MOCK_IMPL(void, directory_get_from_dirserver, ( * sort of dir fetch we'll be doing, so it won't return a bridge * that can't answer our question. */ - /* XXX+++++ Not all bridges handle conditional consensus downloading, - * so, for now, never assume the server supports that. -PP - * Is that assumption still so in 2016? -NM */ const node_t *node = choose_random_dirguard(type); if (node && node->ri) { /* every bridge has a routerinfo. */ @@ -1305,9 +1302,9 @@ compare_strs_(const void **a, const void **b) /** Return the URL we should use for a consensus download. * - * This url depends on whether or not the server we go to - * is sufficiently new to support conditional consensus downloading, - * i.e. GET .../consensus/<b>fpr</b>+<b>fpr</b>+<b>fpr</b> + * Use the "conditional consensus downloading" feature described in + * dir-spec.txt, i.e. + * GET .../consensus/<b>fpr</b>+<b>fpr</b>+<b>fpr</b> * * If 'resource' is provided, it is the name of a consensus flavor to request. */ |