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

[nickm at torproject.org]

commit 5b1c257d9aea56b66b9069c8593fb9a4f00192a3
Merge: c4031ee 116e6af
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 23 01:48:30 2013 -0400

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

 src/or/rendclient.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)