Commit 6efc2a0e authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'tor-github/pr/650' into maint-0.3.5

parents 2e770216 d71ca396

changes/bug29161

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (tests):

    - Detect and suppress "bug" warnings from the util/time test on Windows.

      Fixes bug 29161; bugfix on 0.2.9.3-alpha.

changes/ticket28668

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features (testing):

    - Treat all unexpected ERR and BUG messages as test failures.

      Closes ticket 28668.

changes/ticket29160

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (tests):

    - Do not log an error-level message if we fail to find an IPv6

      network interface from the unit tests. Fixes bug 29160; bugfix on

      0.2.7.3-rc.

src/lib/encoding/time_fmt.c

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
 *

 * Convert *<b>timep</b> to a struct tm in local time, and store the value in

 * *<b>result</b>.  Return the result on success, or NULL on failure.

 *

 * Treat malformatted inputs localtime outputs as a BUG.

 */

struct tm *

tor_localtime_r(const time_t *timep, struct tm *result)
@@ -56,6 +58,8 @@ tor_localtime_r(const time_t *timep, struct tm *result) 
 *

 * Convert *<b>timep</b> to a struct tm in UTC, and store the value in

 * *<b>result</b>.  Return the result on success, or NULL on failure.

 *

 * Treat malformatted inputs or gmtime outputs as a BUG.

 */

struct tm *

tor_gmtime_r(const time_t *timep, struct tm *result)

src/test/test_address.c

+1 −2
Original line number Diff line number Diff line
@@ -1013,7 +1013,7 @@ test_address_get_if_addrs6(void *arg) 


  (void)arg;



  rv = get_interface_address6(LOG_ERR, AF_INET6, &tor_addr);

  rv = get_interface_address6(LOG_WARN, AF_INET6, &tor_addr);



  /* Work even on systems without IPv6 interfaces */

  if (rv == 0) {
@@ -1204,4 +1204,3 @@ struct testcase_t address_tests[] = { 
  ADDRESS_TEST(tor_addr_in_same_network_family, 0),

  END_OF_TESTCASES

};