[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[nickm at torproject.org]

commit 7c4544e5a4780706dee65d2a3ff8c70000b55952
Merge: efa342f 60d633c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 18 14:45:29 2013 -0400

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

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