commit ede102fd4675af8ac4060767f0348f3c93617e80
Merge: 2b9c5ee f72e792
Author: Nick Mathewson <[email protected]>
Date: Sun May 15 20:20:36 2011 -0400
Merge branch 'bug2972' into maint-0.2.2
changes/bug2792_checkdir | 8 ++++++
changes/bug2972 | 5 ++++
doc/tor.1.txt | 5 ++++
src/common/compat.c | 39 +++++++++++++++++++++++++++++++
src/common/compat.h | 2 +
src/common/util.c | 58 ++++++++++++++++++++++++++++++++++++++--------
src/common/util.h | 7 ++++-
src/or/config.c | 13 ++++++++--
src/or/connection.c | 49 ++++++++++++++++++++++++++++++++++++++
src/or/or.h | 1 +
src/test/test_util.c | 30 +++++++++++++++++++++++
11 files changed, 203 insertions(+), 14 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
