Merge remote-tracking branch 'origin/maint-0.2.7'

diff --cc src/or/rendcache.c
index deb2fea4de72a42b76ddd41bdd004f7855ffdabb,93f4440193d00ef4ca16e3ad268105c1baea16c0..ef7d18202621c416813f6143403889425b9631c1
--- 1/src/or/rendcache.c
--- 2/src/or/rendcache.c
+++ b/src/or/rendcache.c
@@@ -127,9 -122,15 +127,15 @@@ rend_cache_failure_intro_entry_free(ren
    tor_free(entry);
  }
  
+ static void
+ rend_cache_failure_intro_entry_free_(void *entry)
+ {
+   rend_cache_failure_intro_entry_free_(entry);
+ }
+ 
  /** Allocate a rend cache failure intro object and return it. <b>failure</b>
   * is set into the object. This function can not fail. */
 -static rend_cache_failure_intro_t *
 +STATIC rend_cache_failure_intro_t *
  rend_cache_failure_intro_entry_new(rend_intro_point_failure_t failure)
  {
    rend_cache_failure_intro_t *entry = tor_malloc(sizeof(*entry));