[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit d732b87e60ee9991f09dadcfed82d9b845fbc41d
Merge: 3f55b76 75fc4db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 12:20:56 2012 -0400

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

 changes/bug5346      |    8 +++++
 src/common/util.c    |   26 +++++++++++-------
 src/test/test_util.c |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 10 deletions(-)

diff --cc src/test/test_util.c
index d9fc6a3,f9a83a3..99c5544
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@@ -2921,13 -1384,8 +2991,14 @@@ test_util_set_env_var_in_sl(void *ptr
  
  struct testcase_t util_tests[] = {
    UTIL_LEGACY(time),
+   UTIL_TEST(parse_http_time, 0),
    UTIL_LEGACY(config_line),
 +  UTIL_LEGACY(config_line_quotes),
 +  UTIL_LEGACY(config_line_comment_character),
 +  UTIL_LEGACY(config_line_escaped_content),
 +#ifndef _WIN32
 +  UTIL_LEGACY(expand_filename),
 +#endif
    UTIL_LEGACY(strmisc),
    UTIL_LEGACY(pow2),
    UTIL_LEGACY(gzip),