Merge remote-tracking branch 'origin/maint-0.2.2'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/common/compat.c
Simple merge

diff --cc src/common/compat.h
Simple merge

diff --cc src/common/util.c
Simple merge

diff --cc src/common/util.h
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/test/test_util.c
index ee2d455b2939d2076d479c71079a8caa48087efb,23cd059cf72f612df5845f6f607aee0cbff17ad4..d338bbac9ce562b69d0bc4bb67c5ddc2a045f31c
--- 1/src/test/test_util.c
--- 2/src/test/test_util.c
+++ b/src/test/test_util.c
@@@ -1495,14 -1315,9 +1524,15 @@@ struct testcase_t util_tests[] = 
    UTIL_TEST(find_str_at_start_of_line, 0),
    UTIL_TEST(asprintf, 0),
    UTIL_TEST(listdir, 0),
+   UTIL_TEST(parent_dir, 0),
  #ifdef MS_WINDOWS
    UTIL_TEST(load_win_lib, 0),
 +#endif
 +  UTIL_TEST(exit_status, 0),
 +#ifndef MS_WINDOWS
 +  UTIL_TEST(fgets_eagain, TT_SKIP),
 +  UTIL_TEST(spawn_background_ok, 0),
 +  UTIL_TEST(spawn_background_fail, 0),
  #endif
    END_OF_TESTCASES
  };