[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.7'

[nickm at torproject.org]

commit d14b009b23ed2398ddc805211f322c3fa5843d04
Merge: 8b01849 aa96abe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 10:54:12 2015 -0400

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

 changes/bug17402   |    3 +++
 src/or/rendcache.c |   14 +++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --cc src/or/rendcache.c
index deb2fea,93f4440..ef7d182
--- 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));