diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-27 13:45:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-27 13:45:28 -0400 |
| commit | 99621bc5a629a81a5a823ce21ac3d967443d0e12 (patch) | |
| tree | 94be79796295cacadf6d04384dc641469205e842 | |
| parent | 8f6cb933b6a8ee63f2e208ec43933ad27afa2af0 (diff) | |
| parent | 0c40dda3ad824d8a782dafae4c4233a949837df3 (diff) | |
| download | tor-99621bc5a629a81a5a823ce21ac3d967443d0e12.tar.gz tor-99621bc5a629a81a5a823ce21ac3d967443d0e12.zip | |
Merge remote-tracking branch 'arma/bug1090-part1-squashed' into bug1090-part1-squashed
| -rw-r--r-- | src/or/rendclient.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c index d444611019..65e632f259 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -764,7 +764,8 @@ rend_client_get_random_intro(const rend_data_t *rend_query) } /** As rend_client_get_random_intro, except assume that StrictNodes is set - * iff <b>strict</b> is true. + * iff <b>strict</b> is true. If <b>warnings</b> is false, don't complain + * to the user when we're out of nodes, even if StrictNodes is true. */ static extend_info_t * rend_client_get_random_intro_impl(const rend_cache_entry_t *entry, |