[tor-commits] [tor/master] Merge remote-tracking branch 'nickm/prop110_v2'

[arma at torproject.org]

commit 3aade2fab7030211b7a8ae6ab1bd310c378be462
Merge: 86079a8 2710a96
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Dec 25 17:43:09 2011 -0500

    Merge remote-tracking branch 'nickm/prop110_v2'

 changes/prop110 |    7 +++++++
 src/or/relay.c  |   30 +++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)