[tor-commits] [tor/master] Merge remote-tracking branch 'arma/ticket18332-try3'

[nickm at torproject.org]

commit ddd30f966a4b186d42650e3b321da8352a19b5f5
Merge: 70024ea e28448a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 21 10:41:23 2016 -0400

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

 changes/ticket18332            |  10 ++++
 src/or/directory.c             |  35 +++++------
 src/or/rendcache.c             |  49 ++++++----------
 src/or/rendcache.h             |  21 +++----
 src/or/rendcommon.c            |  69 ----------------------
 src/or/rendcommon.h            |   3 -
 src/test/test_dir_handle_get.c |  16 +----
 src/test/test_rendcache.c      | 129 +++++++++--------------------------------
 8 files changed, 78 insertions(+), 254 deletions(-)

diff --cc src/or/rendcommon.h
index 7d81976,c520c06..d67552e
--- 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,