commit 3dfed0806c833e7bc34796a412925c502474bebf Merge: 35423d3 b5d6e47 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Feb 16 12:13:12 2014 -0500 Merge remote-tracking branch 'public/bug10722' changes/bug10722_msg | 5 +++++ src/or/rendclient.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-)