[tor-commits] [tor/master] Merge branch 'prop187_squashed'

[nickm at torproject.org]

commit f54a10caa62db6653cd8f5a8c84de3a623428c6c
Merge: fa83397 3826e05
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 12:27:14 2012 -0500

    Merge branch 'prop187_squashed'

 src/or/command.c       |   75 +++++++++++++++++++++++++++++++++++++----------
 src/or/connection_or.c |    4 ++
 src/or/or.h            |    1 +
 3 files changed, 64 insertions(+), 16 deletions(-)