From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 21 Oct 2015 14:54:12 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.7'
X-Git-Tag: tor-0.2.8.1-alpha~286
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d14b009b23ed2398ddc805211f322c3fa5843d04;p=thirdparty%2Ftor.git

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

d14b009b23ed2398ddc805211f322c3fa5843d04
diff --cc src/or/rendcache.c
index deb2fea4de,93f4440193..ef7d182026
--- a/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));