commit c42bd529dea474db1a1af4432b9fe5552c0ca07e Merge: 84f27eb 5938804 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 15 15:14:28 2011 -0400 Merge remote branch 'origin/maint-0.2.2' src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)