Merge remote-tracking branch 'arma/ticket18332-try3'

diff --cc src/or/rendcommon.h
index 7d81976013370f4ae15f39971a88552708d14599,c520c0634d53a0f89a122afd7e8c81e648b90dc6..d67552e40564a194432a8d3c80a804c45db2e808
--- 1/src/or/rendcommon.h
--- 2/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,