commit 3f48c7575e7aacc7199722b992d9098a536d05af Merge: 120d524 f84f75c Author: Nick Mathewson nickm@torproject.org Date: Mon May 7 11:09:50 2012 -0400

Merge branch 'bug5645_take2'

changes/bug5645 | 5 +++++ src/or/rendmid.c | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-)