[tor-commits] [tor/master] Merge branch 'bug3825b-v8-squashed'

[nickm at torproject.org]

commit 4080ac9eee76bf7ef92e71a5a9af27a2aa354ca9
Merge: ec18c8a dae0007
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 11:15:49 2011 -0500

    Merge branch 'bug3825b-v8-squashed'

 changes/bug3825b     |    7 +++
 src/or/or.h          |    5 ++
 src/or/rendservice.c |  128 +++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 138 insertions(+), 2 deletions(-)