[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[arma at torproject.org]

commit 42335972d5f73c18b59459201d80f4e769cc2a5b
Merge: a2ea9df d5cfbf9
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Aug 10 18:00:47 2013 -0400

    Merge branch 'maint-0.2.4' into release-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(-)