[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug2385'

commit 888d5d08fe4efb52a5923726dcfb75036bf90714 Merge: aad71ee dcb1d0a Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 25 12:05:36 2012 -0400 Merge remote-tracking branch 'public/bug2385' changes/bug2385 | 9 + src/common/util.c | 10 + src/common/util.h | 1 + src/or/config.c | 2 +- src/or/rendclient.c | 46 ++++- src/or/rendservice.c | 506 ++++++++++++++++++++++++++++--------------------- src/or/rendservice.h | 2 +- 7 files changed, 348 insertions(+), 228 deletions(-)