commit 9ddc1fb10c0e40fccee6d4d8b122250f8358ca81 Merge: da42353 b552547 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 20 14:02:07 2015 -0500 Merge remote-tracking branch 'dgoulet/bug14224_025_v1' changes/bug14224 | 4 ++++ src/or/rendclient.c | 7 +++++++ 2 files changed, 11 insertions(+)