commit cee6a991d2185b6bf600cda092c18eba83360efb Merge: fd9ba5e 7c4544e Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 18 14:46:25 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4

src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+)