commit af70e4313160b792e8e8b4717f3cab828e4de42f
Merge: 9615ad3 05aed5b
Author: Nick Mathewson <ni...@torproject.org>
Date:   Fri Oct 14 10:21:41 2016 -0400

    Merge remote-tracking branch 'public/spaces_in_unix_addrs'

 changes/feature18753       |   6 ++
 doc/tor.1.txt              |   9 ++-
 src/common/util.c          |   2 +-
 src/common/util.h          |   1 +
 src/or/config.c            | 137 ++++++++++++++++++--------------
 src/or/config.h            |   6 +-
 src/or/rendservice.c       |  32 ++++----
 src/test/test_config.c     | 192 +++++++++++++++++++++++++++++++++++++++++++++
 src/test/test_controller.c |  49 ++++++++++++
 9 files changed, 352 insertions(+), 82 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to