[tor-commits] [tor/master] Merge remote-tracking branch 'yawning/feature15435'

[nickm at torproject.org]

commit aa7b7922505ef8dfab6df49f5537ffba92322b09
Merge: 34fa4ad fda61e0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 1 13:34:14 2015 -0400

    Merge remote-tracking branch 'yawning/feature15435'

 changes/feature15435      |    5 +++
 src/common/util.c         |   81 +++++++++++++++++++++++++++++++++++++--------
 src/common/util.h         |    3 ++
 src/or/transports.c       |    5 +++
 src/test/test_util_slow.c |    2 ++
 5 files changed, 82 insertions(+), 14 deletions(-)