Merge remote-tracking branch 'arma/bug1090-part1-squashed' into bug1090-part1-squashed

This commit is contained in:
Nick Mathewson 2011-04-27 13:45:28 -04:00
commit 99621bc5a6

View File

@ -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 /** 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 * static extend_info_t *
rend_client_get_random_intro_impl(const rend_cache_entry_t *entry, rend_client_get_random_intro_impl(const rend_cache_entry_t *entry,