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

[nickm at torproject.org]

commit b551988ef46ac29427a3bd8d8a76965b190623ab
Merge: dd44ff6 8a01a7c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 18 08:45:13 2013 -0400

    Merge branch 'bug8929_rebase_2'

 changes/bug8929        |    4 +++
 doc/tor.1.txt          |    5 +++
 src/common/util.c      |    9 ++---
 src/common/util.h      |    3 +-
 src/or/config.c        |   91 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/or/config.h        |    3 ++
 src/or/or.h            |    3 ++
 src/or/transports.c    |   63 +++++++++++++++++++++++++++++----
 src/or/transports.h    |    6 ++++
 src/test/test_config.c |   72 ++++++++++++++++++++++++++++++++++++++
 src/test/test_pt.c     |   56 +++++++++++++++++++++++++++++
 src/test/test_util.c   |   14 ++++----
 12 files changed, 309 insertions(+), 20 deletions(-)