commit f7986269c32b94929a705a8f125b353e505a488c Merge: 8a96a85 7c4544e Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 18 14:47:15 2013 -0400

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

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