commit 2a9b279163da4ba0d870dd5e9b7fc1ae9591127c Merge: 2367f7e 72ed4a4 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 10 09:33:55 2012 -0500 Merge remote-tracking branch 'rransom-tor/bug4883' src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)