[tor-commits] [tor/master] Merge branch 'bug5105-v2-squashed'

[nickm at torproject.org]

commit eaedcba49315f3fe384c379f30692793ca9da18e
Merge: 3cdc464 773290c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Feb 17 11:50:10 2012 -0500

    Merge branch 'bug5105-v2-squashed'
    
    Conflicts:
    	src/or/transports.c

 changes/bug5105      |   11 +++
 src/common/util.c    |  199 +++++++++++++++++++++++++++++++++++++++--
 src/common/util.h    |   30 +++++-
 src/or/transports.c  |  235 +++++++++++++-----------------------------------
 src/test/test_util.c |  242 ++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 531 insertions(+), 186 deletions(-)