commit 49fd76be05cf5d0fcf5b766e87ac8a9e2207224f Merge: ad49ceb d5cfbf9 Author: Roger Dingledine arma@torproject.org Date: Sat Aug 10 18:30:20 2013 -0400

Merge branch 'maint-0.2.4'

changes/v3_intro_len | 8 ++++++++ src/or/rendservice.c | 10 ++-------- src/or/rendservice.h | 2 -- 3 files changed, 10 insertions(+), 10 deletions(-)