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

[nickm at torproject.org]

commit b0688bbf49345cc294d2f4095c3ad11171a61f0e
Merge: 39a0a2c a9f7867
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 6 17:53:45 2012 -0500

    Merge branch 'bug7195'

 changes/bug7195     |    4 ++++
 src/common/util.c   |   19 +++++++++++++++++++
 src/common/util.h   |    2 ++
 src/or/transports.c |    9 ++++++++-
 4 files changed, 33 insertions(+), 1 deletions(-)