From: Nick Mathewson Date: Mon, 21 Mar 2016 14:41:23 +0000 (-0400) Subject: Merge remote-tracking branch 'arma/ticket18332-try3' X-Git-Tag: tor-0.2.8.2-alpha~56 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd30f966a4b186d42650e3b321da8352a19b5f5;p=thirdparty%2Ftor.git Merge remote-tracking branch 'arma/ticket18332-try3' --- ddd30f966a4b186d42650e3b321da8352a19b5f5 diff --cc src/or/rendcommon.h index 7d81976013,c520c0634d..d67552e405 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@@ -58,9 -57,7 +57,7 @@@ void rend_get_descriptor_id_bytes(char const char *service_id, const char *secret_id_part); int hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, - const char *id); + const char *id); - int hid_serv_acting_as_directory(void); - MOCK_DECL(int, hid_serv_responsible_for_desc_id, (const char *id)); rend_data_t *rend_data_dup(const rend_data_t *data); rend_data_t *rend_data_client_create(const char *onion_address,