September 2012 - tor-commits - lists.torproject.org

r25789: {website} new tor versions (in website/trunk: . include)
by Roger Dingledine 11 Sep '12

11 Sep '12

Author: arma Date: 2012-09-11 19:31:35 +0000 (Tue, 11 Sep 2012) New Revision: 25789 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: new tor versions Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-09-10 22:56:01 UTC (rev 25788) +++ website/trunk/Makefile 2012-09-11 19:31:35 UTC (rev 25789) @@ -10,8 +10,8 @@ # 4. make # 5. ./publish -export STABLETAG=tor-0.2.2.38 -export DEVTAG=tor-0.2.3.21-rc +export STABLETAG=tor-0.2.2.39 +export DEVTAG=tor-0.2.3.22-rc WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-09-10 22:56:01 UTC (rev 25788) +++ website/trunk/include/versions.wmi 2012-09-11 19:31:35 UTC (rev 25789) @@ -1,5 +1,5 @@ -<define-tag version-stable whitespace=delete>0.2.2.38</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.21-rc</define-tag> +<define-tag version-stable whitespace=delete>0.2.2.39</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.22-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.38</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.20-rc</define-tag>

1 0

[torbrowser/maint-2.3] bump alpha TBBs to 2.3.22-alpha for Tor 0.2.3.22-rc
by erinn＠torproject.org 11 Sep '12

11 Sep '12

commit 66d0e9d05742365a7e35936250fbe9e624afab0f Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Sep 11 19:50:59 2012 +0100 bump alpha TBBs to 2.3.22-alpha for Tor 0.2.3.22-rc --- README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/versions-alpha.mk | 4 ++-- changelog.linux-2.3 | 6 ++++++ changelog.osx-2.3 | 6 ++++++ changelog.windows-2.3 | 6 ++++++ 7 files changed, 23 insertions(+), 5 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 27fd198..4107375 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.21-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.22-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 15.0.1 \_ Torbutton 1.4.6.1 |_ NoScript 2.5.4 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 5ae9f3f..c1098c3 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.21-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.22-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 15.0.1 \_ Torbutton 1.4.6.1 |_ NoScript 2.5.4 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 9cbc24b..58be1c1 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.21-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.22-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 15.0.1 \_ Torbutton 1.4.6.1 |_ NoScript 2.5.4 diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 95cfc77..aba791c 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.3.21-alpha +RELEASE_VER=2.3.22-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,7 +8,7 @@ LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.20-stable -TOR_VER=0.2.3.21-rc +TOR_VER=0.2.3.22-rc PIDGIN_VER=2.6.4 FIREFOX_VER=15.0.1 MOZBUILD_VER=1.5.1 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index cbe4461..88c9546 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.3.22-alpha-1); suite=linux + + * Update Tor to 0.2.3.22-rc + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:49:11 BST 2012 + Tor Browser Bundle (2.3.21-alpha-1); suite=linux * Update Tor to 0.2.3.21-rc diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index c97895d..a4cbba6 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.3.22-alpha-1); suite=osx + + * Update Tor to 0.2.3.22-rc + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:49:06 BST 2012 + Tor Browser Bundle (2.3.21-alpha-1); suite=osx * Update Tor to 0.2.3.21-rc diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index e95e082..81026e2 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.3.22-alpha-1); suite=windows + + * Update Tor to 0.2.3.22-rc + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:49:08 BST 2012 + Tor Browser Bundle (2.3.21-alpha-1); suite=windows * Update Tor to 0.2.3.21-rc

1 0

[torbrowser/master] bump alpha TBBs to 2.3.22-alpha for Tor 0.2.3.22-rc
by erinn＠torproject.org 11 Sep '12

11 Sep '12

commit 66d0e9d05742365a7e35936250fbe9e624afab0f Author: Erinn Clark <erinn(a)torproject.org> Date: Tue Sep 11 19:50:59 2012 +0100 bump alpha TBBs to 2.3.22-alpha for Tor 0.2.3.22-rc --- README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/versions-alpha.mk | 4 ++-- changelog.linux-2.3 | 6 ++++++ changelog.osx-2.3 | 6 ++++++ changelog.windows-2.3 | 6 ++++++ 7 files changed, 23 insertions(+), 5 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 27fd198..4107375 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.21-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.22-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 15.0.1 \_ Torbutton 1.4.6.1 |_ NoScript 2.5.4 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 5ae9f3f..c1098c3 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.21-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.22-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 15.0.1 \_ Torbutton 1.4.6.1 |_ NoScript 2.5.4 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 9cbc24b..58be1c1 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -5,7 +5,7 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.3.21-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.3.22-rc (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 15.0.1 \_ Torbutton 1.4.6.1 |_ NoScript 2.5.4 diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 95cfc77..aba791c 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.3.21-alpha +RELEASE_VER=2.3.22-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,7 +8,7 @@ LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.20-stable -TOR_VER=0.2.3.21-rc +TOR_VER=0.2.3.22-rc PIDGIN_VER=2.6.4 FIREFOX_VER=15.0.1 MOZBUILD_VER=1.5.1 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index cbe4461..88c9546 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.3.22-alpha-1); suite=linux + + * Update Tor to 0.2.3.22-rc + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:49:11 BST 2012 + Tor Browser Bundle (2.3.21-alpha-1); suite=linux * Update Tor to 0.2.3.21-rc diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index c97895d..a4cbba6 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.3.22-alpha-1); suite=osx + + * Update Tor to 0.2.3.22-rc + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:49:06 BST 2012 + Tor Browser Bundle (2.3.21-alpha-1); suite=osx * Update Tor to 0.2.3.21-rc diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index e95e082..81026e2 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -1,3 +1,9 @@ +Tor Browser Bundle (2.3.22-alpha-1); suite=windows + + * Update Tor to 0.2.3.22-rc + + -- Erinn Clark <erinn(a)torproject.org> Tue Sep 11 19:49:08 BST 2012 + Tor Browser Bundle (2.3.21-alpha-1); suite=windows * Update Tor to 0.2.3.21-rc

1 0

[tor/release-0.2.3] bump to 0.2.3.22-rc
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit 213ba1a70b41ea975f2e0119a746aa1bad6f1e22 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 11 14:44:10 2012 -0400 bump to 0.2.3.22-rc --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 47a84bb..587827f 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.21-rc) +AM_INIT_AUTOMAKE(tor, 0.2.3.22-rc) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 4b7bac3..e786ed0 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.21-rc" +!define VERSION "0.2.3.22-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 46a33e6..f50e84a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.21-rc" +#define VERSION "0.2.3.22-rc"

1 0

[tor/master] put all the changelogs into master
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit b8f93c5dd7a069c9e5ac3469d067a31c3992fa25 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 11 14:36:54 2012 -0400 put all the changelogs into master --- ChangeLog | 30 ++++++++++++++++++++++++++++++ ReleaseNotes | 15 +++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74183b5..495ddf2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,33 @@ +Changes in version 0.2.3.22-rc - 2012-09-11 + Tor 0.2.3.22-rc fixes another opportunity for a remotely triggerable + assertion. + + o Security fixes: + - Fix an assertion failure in tor_timegm() that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + + o Minor bugfixes: + - Avoid segfault when starting up having run with an extremely old + version of Tor and parsing its state file. Fixes bug 6801; bugfix + on 0.2.2.23-alpha. + + +Changes in version 0.2.2.39 - 2012-09-11 + Tor 0.2.2.39 fixes two more opportunities for remotely triggerable + assertions. + + o Security fixes: + - Fix an assertion failure in tor_timegm() that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + - Do not crash when comparing an address with port value 0 to an + address policy. This bug could have been used to cause a remote + assertion failure by or against directory authorities, or to + allow some applications to crash clients. Fixes bug 6690; bugfix + on 0.2.1.10-alpha. + + Changes in version 0.2.4.2-alpha - 2012-09-10 Tor 0.2.4.2-alpha enables port forwarding for pluggable transports, raises the default rate limiting even more, and makes the bootstrapping diff --git a/ReleaseNotes b/ReleaseNotes index f61b8f6..9e02374 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,21 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.2.39 - 2012-09-11 + Tor 0.2.2.39 fixes two more opportunities for remotely triggerable + assertions. + + o Security fixes: + - Fix an assertion failure in tor_timegm() that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + - Do not crash when comparing an address with port value 0 to an + address policy. This bug could have been used to cause a remote + assertion failure by or against directory authorities, or to + allow some applications to crash clients. Fixes bug 6690; bugfix + on 0.2.1.10-alpha. + + Changes in version 0.2.2.38 - 2012-08-12 Tor 0.2.2.38 fixes a remotely triggerable crash bug, and fixes a timing attack that could in theory leak path information.

1 0

[tor/release-0.2.3] move 0.2.2.39 changelog forward
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit e2fd67fc56af15a392dc8e0963f0c29f50cb55bb Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 11 14:30:11 2012 -0400 move 0.2.2.39 changelog forward --- ChangeLog | 15 +++++++++++++++ ReleaseNotes | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1165aa..a5cc499 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,21 @@ Changes in version 0.2.3.22-rc - 2012-09-11 on 0.2.2.23-alpha. +Changes in version 0.2.2.39 - 2012-09-11 + Tor 0.2.2.39 fixes two more opportunities for remotely triggerable + assertions. + + o Security fixes: + - Fix an assertion failure in tor_timegm() that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + - Do not crash when comparing an address with port value 0 to an + address policy. This bug could have been used to cause a remote + assertion failure by or against directory authorities, or to + allow some applications to crash clients. Fixes bug 6690; bugfix + on 0.2.1.10-alpha. + + Changes in version 0.2.3.21-rc - 2012-09-05 Tor 0.2.3.21-rc is the fourth release candidate for the Tor 0.2.3.x series. It fixes a trio of potential security bugs, fixes a bug where diff --git a/ReleaseNotes b/ReleaseNotes index 0d710d9..f452257 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,21 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.2.39 - 2012-09-11 + Tor 0.2.2.39 fixes two more opportunities for remotely triggerable + assertions. + + o Security fixes: + - Fix an assertion failure in tor_timegm() that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + - Do not crash when comparing an address with port value 0 to an + address policy. This bug could have been used to cause a remote + assertion failure by or against directory authorities, or to + allow some applications to crash clients. Fixes bug 6690; bugfix + on 0.2.1.10-alpha. + + Changes in version 0.2.2.38 - 2012-08-12 Tor 0.2.2.38 fixes a remotely triggerable crash bug, and fixes a timing attack that could in theory leak path information.

1 0

[tor/release-0.2.3] fold in 0.2.3.22-rc changes
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit de3cd992406ef47ccd74b25b0efc14a437c1438f Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 11 14:26:30 2012 -0400 fold in 0.2.3.22-rc changes --- ChangeLog | 15 +++++++++++++++ changes/bug6801 | 5 ----- changes/bug6811 | 5 ----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e78957..a1165aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +Changes in version 0.2.3.22-rc - 2012-09-11 + Tor 0.2.3.22-rc fixes another opportunity for a remotely triggerable + assertion. + + o Security fixes: + - Fix an assertion failure in tor_timegm() that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + + o Minor bugfixes: + - Avoid segfault when starting up having run with an extremely old + version of Tor and parsing its state file. Fixes bug 6801; bugfix + on 0.2.2.23-alpha. + + Changes in version 0.2.3.21-rc - 2012-09-05 Tor 0.2.3.21-rc is the fourth release candidate for the Tor 0.2.3.x series. It fixes a trio of potential security bugs, fixes a bug where diff --git a/changes/bug6801 b/changes/bug6801 deleted file mode 100644 index ef21acc..0000000 --- a/changes/bug6801 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Avoid segfault when starting up having run with an extremely old - version of Tor and parsing its state file. Fixes bug 6801; bugfix on - 0.2.2.23-alpha. - diff --git a/changes/bug6811 b/changes/bug6811 deleted file mode 100644 index 841ec1c..0000000 --- a/changes/bug6811 +++ /dev/null @@ -1,5 +0,0 @@ - o Major security fixes: - - Fix an assertion failure in tor_timegm that could be triggered - by a badly formatted directory object. Bug found by fuzzing with - Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. -

1 0

[tor/release-0.2.3] Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit 84f47ffc462dface8db1def322414daa43400d1c Merge: 1c30e6a 973c18b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:14:43 2012 -0400 Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2 changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-)

1 0

[tor/release-0.2.3] Merge branch 'maint-0.2.3' into release-0.2.3
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit 57f05c318d25c98b0447d19e18c82b1bb6f4248c Merge: 139a81c 5833861 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 11 14:18:14 2012 -0400 Merge branch 'maint-0.2.3' into release-0.2.3 changes/bug6801 | 5 +++++ changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/or/rephist.c | 3 ++- src/test/test_util.c | 13 +++++++++++++ 8 files changed, 45 insertions(+), 19 deletions(-)

1 0

[tor/release-0.2.3] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
by arma＠torproject.org 11 Sep '12

11 Sep '12

commit 5833861f62d2667eeda1ed0f6595763aa00250b0 Merge: 8731a4e 84f47ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 11 13:20:15 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 Conflicts: src/test/test_util.c changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-) diff --cc src/test/test_util.c index 9eca904,12e3fa9..4f9eb73 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -14,10 -13,19 +14,23 @@@ #include "mempool.h" #include "memarea.h" +#ifdef _WIN32 +#include <tchar.h> +#endif + + /* XXXX this is a minimal wrapper to make the unit tests compile with the + * changed tor_timegm interface. */ + static time_t + tor_timegm_wrapper(const struct tm *tm) + { + time_t t; + if (tor_timegm(tm, &t) < 0) + return -1; + return t; + } + + #define tor_timegm tor_timegm_wrapper + static void test_util_time(void) {

1 0