From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 May 2012 16:20:56 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.16-alpha~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d732b87e60ee9991f09dadcfed82d9b845fbc41d;p=thirdparty%2Ftor.git

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

d732b87e60ee9991f09dadcfed82d9b845fbc41d
diff --cc src/test/test_util.c
index d9fc6a33c5,f9a83a38a5..99c5544508
--- 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),