[tor-commits] [tor/maint-0.2.5] Merge branch 'bug15515_024' into maint-0.2.4

[nickm at torproject.org]

commit 01e4bc80cd75bbf2a4ce3b18ff17550eed993bb0
Merge: 5f46a59 bcb8393
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 3 09:36:59 2015 -0400

    Merge branch 'bug15515_024' into maint-0.2.4

 changes/bug15515 |    4 ++++
 src/or/or.h      |    3 +++
 src/or/rendmid.c |   14 ++++++++++++++
 3 files changed, 21 insertions(+)