commit 386966142ecebc23e78e57ae26323aee33d410f9 Merge: cca806c 8ea6d29 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Sep 11 16:25:14 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug2442 | 8 ++++++++ changes/bug2442b | 8 ++++++++ src/or/or.h | 7 +++++-- src/or/rendservice.c | 13 +++++++++++-- 4 files changed, 32 insertions(+), 4 deletions(-)