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

[torbrowser/maint-2.2] bump stable bundles for tor 0.2.2.38
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit e2b3a8fb46ce052e0828676157247a2a12511c51 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:01:52 2012 +0100 bump stable bundles for tor 0.2.2.38 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 0eae006..c051a3c 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 - |_ HTTPS-Everywhere 2.0.5 + |_ NoScript 2.5 + |_ HTTPS-Everywhere 2.1 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 05ee1e2..1675e39 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 - |_ HTTPS-Everywhere 2.0.5 + |_ NoScript 2.5 + |_ HTTPS-Everywhere 2.1 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 8a8b69b..6cb3ef9 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 - |_ HTTPS-Everywhere 2.0.5 + |_ NoScript 2.5 + |_ HTTPS-Everywhere 2.1 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index b2e5f7b..170916b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 718c8ab..a9c5909 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 2b3e508..bfba975 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.37 +RELEASE_VER=2.2.38 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,14 +8,14 @@ LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.19-stable -TOR_VER=0.2.2.37 +TOR_VER=0.2.2.38 PIDGIN_VER=2.6.4 FIREFOX_VER=10.0.6esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.4.8 -HTTPSEVERYWHERE_VER=2.0.5 +NOSCRIPT_VER=2.5 +HTTPSEVERYWHERE_VER=2.1 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a871270..0492f84 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 507b873..31149a2 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.38-1); suite=linux + + * Update Tor to 0.2.2.38 + * Update NoScript to 2.5 + * Update HTTPS Everywhere to 2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:58 BST 2012 + Tor Browser Bundle (2.2.37-2); suite=linux * Update Firefox to 10.0.6esr diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 68e5c09..f1c7681 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.38-1); suite=osx + + * Update Tor to 0.2.2.38 + * Update NoScript to 2.5 + * Update HTTPS Everywhere to 2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:53 BST 2012 + Tor Browser Bundle (2.2.37-2); suite=osx * Update Firefox to 10.0.6esr diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 37653b6..2d0fb2c 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.38-1); suite=windows + + * Update Tor to 0.2.2.38 + * Update NoScript to 2.5 + * Update HTTPS Everywhere to 2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:55 BST 2012 + Tor Browser Bundle (2.2.37-2); suite=windows * Update Firefox to 10.0.6esr

1 0

[torbrowser/master] Merge branch 'maint-2.2'
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit f9919a1ea588649b20b5d19c9c3f161aa158a9c1 Merge: ef87887 e2b3a8f Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:02:10 2012 +0100 Merge branch 'maint-2.2' README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-)

1 0

[torbrowser/maint-2.3] bump stable bundles for tor 0.2.2.38
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit e2b3a8fb46ce052e0828676157247a2a12511c51 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:01:52 2012 +0100 bump stable bundles for tor 0.2.2.38 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 0eae006..c051a3c 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 - |_ HTTPS-Everywhere 2.0.5 + |_ NoScript 2.5 + |_ HTTPS-Everywhere 2.1 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 05ee1e2..1675e39 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 - |_ HTTPS-Everywhere 2.0.5 + |_ NoScript 2.5 + |_ HTTPS-Everywhere 2.1 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 8a8b69b..6cb3ef9 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 - |_ HTTPS-Everywhere 2.0.5 + |_ NoScript 2.5 + |_ HTTPS-Everywhere 2.1 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index b2e5f7b..170916b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 718c8ab..a9c5909 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 2b3e508..bfba975 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.37 +RELEASE_VER=2.2.38 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,14 +8,14 @@ LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.19-stable -TOR_VER=0.2.2.37 +TOR_VER=0.2.2.38 PIDGIN_VER=2.6.4 FIREFOX_VER=10.0.6esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.4.8 -HTTPSEVERYWHERE_VER=2.0.5 +NOSCRIPT_VER=2.5 +HTTPSEVERYWHERE_VER=2.1 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a871270..0492f84 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 507b873..31149a2 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.38-1); suite=linux + + * Update Tor to 0.2.2.38 + * Update NoScript to 2.5 + * Update HTTPS Everywhere to 2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:58 BST 2012 + Tor Browser Bundle (2.2.37-2); suite=linux * Update Firefox to 10.0.6esr diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 68e5c09..f1c7681 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.38-1); suite=osx + + * Update Tor to 0.2.2.38 + * Update NoScript to 2.5 + * Update HTTPS Everywhere to 2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:53 BST 2012 + Tor Browser Bundle (2.2.37-2); suite=osx * Update Firefox to 10.0.6esr diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 37653b6..2d0fb2c 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.38-1); suite=windows + + * Update Tor to 0.2.2.38 + * Update NoScript to 2.5 + * Update HTTPS Everywhere to 2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:55 BST 2012 + Tor Browser Bundle (2.2.37-2); suite=windows * Update Firefox to 10.0.6esr

1 0

[torbrowser/master] bump stable bundles for tor 0.2.2.38
by erinn＠torproject.org 13 Aug '12

13 Aug '12

commit e2b3a8fb46ce052e0828676157247a2a12511c51 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 13 23:01:52 2012 +0100 bump stable bundles for tor 0.2.2.38 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 40 insertions(+), 16 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 0eae006..c051a3c 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 - |_ HTTPS-Everywhere 2.0.5 + |_ NoScript 2.5 + |_ HTTPS-Everywhere 2.1 Usage ----- diff --git a/README.OSX-2.2 b/README.OSX-2.2 index 05ee1e2..1675e39 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 - |_ HTTPS-Everywhere 2.0.5 + |_ NoScript 2.5 + |_ HTTPS-Everywhere 2.1 Usage ----- diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 8a8b69b..6cb3ef9 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.20 (with Qt 4.8.1) -Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) +Tor 0.2.2.38 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.8 - |_ HTTPS-Everywhere 2.0.5 + |_ NoScript 2.5 + |_ HTTPS-Everywhere 2.1 Usage ----- diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index b2e5f7b..170916b 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 718c8ab..a9c5909 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=x86_64 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 2b3e508..bfba975 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.2.37 +RELEASE_VER=2.2.38 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c @@ -8,14 +8,14 @@ LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.19-stable -TOR_VER=0.2.2.37 +TOR_VER=0.2.2.38 PIDGIN_VER=2.6.4 FIREFOX_VER=10.0.6esr MOZBUILD_VER=1.5.1 PYMAKE_VER=87d436cd8974 TORBUTTON_VER=1.4.6 -NOSCRIPT_VER=2.4.8 -HTTPSEVERYWHERE_VER=2.0.5 +NOSCRIPT_VER=2.5 +HTTPSEVERYWHERE_VER=2.1 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index a871270..0492f84 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 507b873..31149a2 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.38-1); suite=linux + + * Update Tor to 0.2.2.38 + * Update NoScript to 2.5 + * Update HTTPS Everywhere to 2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:58 BST 2012 + Tor Browser Bundle (2.2.37-2); suite=linux * Update Firefox to 10.0.6esr diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 68e5c09..f1c7681 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.38-1); suite=osx + + * Update Tor to 0.2.2.38 + * Update NoScript to 2.5 + * Update HTTPS Everywhere to 2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:53 BST 2012 + Tor Browser Bundle (2.2.37-2); suite=osx * Update Firefox to 10.0.6esr diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 37653b6..2d0fb2c 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.38-1); suite=windows + + * Update Tor to 0.2.2.38 + * Update NoScript to 2.5 + * Update HTTPS Everywhere to 2.1 + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 13 22:58:55 BST 2012 + Tor Browser Bundle (2.2.37-2); suite=windows * Update Firefox to 10.0.6esr

1 0

[vidalia/master] Fix RouterDescriptor values when updated from a RouterStatus
by chiiph＠torproject.org 13 Aug '12

13 Aug '12

commit b3d4f7f00f0326207229aeb10a0d0961b32ed6a8 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Aug 13 18:35:41 2012 -0300 Fix RouterDescriptor values when updated from a RouterStatus --- changes/bug6601 | 2 ++ src/torcontrol/RouterDescriptor.cpp | 7 ++++--- src/vidalia/network/RouterDescriptorView.cpp | 8 +++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/changes/bug6601 b/changes/bug6601 new file mode 100644 index 0000000..cea8133 --- /dev/null +++ b/changes/bug6601 @@ -0,0 +1,2 @@ + o Fix RouterDescriptor's bandwidth and uptime values when defined from the + consensus. Fixes bug 6601. diff --git a/src/torcontrol/RouterDescriptor.cpp b/src/torcontrol/RouterDescriptor.cpp index 26051c1..2c2b147 100644 --- a/src/torcontrol/RouterDescriptor.cpp +++ b/src/torcontrol/RouterDescriptor.cpp @@ -106,7 +106,8 @@ RouterDescriptor::appendRouterStatusInfo(const RouterStatus &rs) _ip = rs.ipAddress(); _orPort = rs.orPort(); _dirPort = rs.dirPort(); - _avgBandwidth = rs.bandwidth(); - _burstBandwidth = rs.bandwidth(); - _observedBandwidth = rs.bandwidth(); + _avgBandwidth = rs.bandwidth() * 1024; + _burstBandwidth = rs.bandwidth() * 1024; + _observedBandwidth = rs.bandwidth() * 1024; + _published = rs.published(); } diff --git a/src/vidalia/network/RouterDescriptorView.cpp b/src/vidalia/network/RouterDescriptorView.cpp index bb4b19d..8700612 100644 --- a/src/vidalia/network/RouterDescriptorView.cpp +++ b/src/vidalia/network/RouterDescriptorView.cpp @@ -106,7 +106,8 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist) /* Add the IP address and router platform information */ html.append(trow(tcol(b(tr("IP Address:"))) + tcol(rd.ip().toString()))); - html.append(trow(tcol(b(tr("Platform:"))) + tcol(rd.platform()))); + if (!rd.platform().isEmpty()) + html.append(trow(tcol(b(tr("Platform:"))) + tcol(rd.platform()))); /* If the router is online, then show the uptime and bandwidth stats. */ if (!rd.offline()) { @@ -121,8 +122,9 @@ RouterDescriptorView::display(QList<RouterDescriptor> rdlist) } /* Date the router was published */ - html.append(trow(tcol(b(tr("Last Updated:"))) + - tcol(string_format_datetime(rd.published()) + " GMT"))); + if (!rd.published().isNull()) + html.append(trow(tcol(b(tr("Last Updated:"))) + + tcol(string_format_datetime(rd.published()) + " GMT"))); html.append("</table>");

1 0

[vidalia/alpha] Fix RouterDescriptor values when updated from a RouterStatus
by chiiph＠torproject.org 13 Aug '12

13 Aug '12

commit da706b72cf029c5022ce823e504c8e6e0fd547b9 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Aug 13 18:35:41 2012 -0300 Fix RouterDescriptor values when updated from a RouterStatus Conflicts: src/vidalia/network/RouterDescriptorView.cpp --- changes/bug6601 | 2 ++ src/torcontrol/RouterDescriptor.cpp | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug6601 b/changes/bug6601 new file mode 100644 index 0000000..cea8133 --- /dev/null +++ b/changes/bug6601 @@ -0,0 +1,2 @@ + o Fix RouterDescriptor's bandwidth and uptime values when defined from the + consensus. Fixes bug 6601. diff --git a/src/torcontrol/RouterDescriptor.cpp b/src/torcontrol/RouterDescriptor.cpp index 0fead9c..a3ee3eb 100644 --- a/src/torcontrol/RouterDescriptor.cpp +++ b/src/torcontrol/RouterDescriptor.cpp @@ -107,9 +107,10 @@ RouterDescriptor::appendRouterStatusInfo(const RouterStatus &rs) _ip = rs.ipAddress(); _orPort = rs.orPort(); _dirPort = rs.dirPort(); - _avgBandwidth = rs.bandwidth(); - _burstBandwidth = rs.bandwidth(); - _observedBandwidth = rs.bandwidth(); + _avgBandwidth = rs.bandwidth() * 1024; + _burstBandwidth = rs.bandwidth() * 1024; + _observedBandwidth = rs.bandwidth() * 1024; + _published = rs.published(); } RouterDescriptor *

1 0

[torspec/master] trivial fixes from earlier readings
by arma＠torproject.org 13 Aug '12

13 Aug '12

commit 5ce6cbbb5f6b2e9f40ccecea0029c82e3fdea61c Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 13 16:11:46 2012 -0400 trivial fixes from earlier readings --- .../190-shared-secret-bridge-authorization.txt | 8 ++++---- proposals/191-mitm-bridge-detection-resistance.txt | 14 +++++++------- proposals/203-https-frontend.txt | 4 ++-- proposals/ideas/xxx-port-knocking.txt | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/proposals/190-shared-secret-bridge-authorization.txt b/proposals/190-shared-secret-bridge-authorization.txt index 8683652..e3c2f79 100644 --- a/proposals/190-shared-secret-bridge-authorization.txt +++ b/proposals/190-shared-secret-bridge-authorization.txt @@ -7,7 +7,7 @@ Status: Needs-Revision 1. Overview Proposals 187 and 189 introduced AUTHORIZE and AUTHORIZED cells. - Their purpose is to make bridge relays scanning resistant against + Their purpose is to make bridge relays scanning-resistant against censoring adversaries capable of probing hosts to observe whether they speak the Tor protocol. @@ -58,7 +58,7 @@ Status: Needs-Revision generating 10 octets of random data using a strong RNG or PRNG. Tor bridge implementations MUST store the shared secret in - 'DataDirectory/keys/bridge_auth_ss_key' in hexademical encoding. + 'DataDirectory/keys/bridge_auth_ss_key' in hexadecimal encoding. Tor bridge implementations MUST support the boolean 'BridgeRequireClientSharedSecretAuthorization' configuration file @@ -73,9 +73,9 @@ Status: Needs-Revision Tor client implementations must extend their Bridge line format to support bridge shared secrets. The new format is: - Bridge <method> <address:port> [["keyid="]<id-fingerprint>] ["shared_secret="<shared_secret>] + Bridge [<method>] <address[:port]> [["keyid="]<id-fingerprint>] ["shared_secret="<shared_secret>] - where <shared_secret> is the bridge shared secret in hexademical + where <shared_secret> is the bridge shared secret in hexadecimal encoding. Tor clients who use bridges with shared-secret-based client diff --git a/proposals/191-mitm-bridge-detection-resistance.txt b/proposals/191-mitm-bridge-detection-resistance.txt index 013d76c..5e9848e 100644 --- a/proposals/191-mitm-bridge-detection-resistance.txt +++ b/proposals/191-mitm-bridge-detection-resistance.txt @@ -14,7 +14,7 @@ Status: Open proposals is that of an adversary capable of performing Man In The Middle attacks to Tor clients. At the moment, Tor clients using the v3 link protocol have no way to detect such an MITM attack, and - will gladly send an VERSIONS or an AUTHORIZE cell to the MITMed + will gladly send a VERSIONS or AUTHORIZE cell to the MITMed connection, thereby revealing the Tor protocol and thus the bridge. This proposal introduces a way for clients to detect an MITMed SSL @@ -27,8 +27,8 @@ Status: Open certificate and the client blindly accepting it. This allows the adversary to perform an MITM attack. - A Tor client must detect the MITM attack before he initializes the - Tor protocol by sending a VERSIONS or an AUTHORIZE cell. A good + A Tor client must detect the MITM attack before he initiates the + Tor protocol by sending a VERSIONS or AUTHORIZE cell. A good moment to detect such an MITM attack is during the SSL handshake. To achieve that, bridge operators provide their bridge users with a @@ -46,13 +46,13 @@ Status: Open 3. Security implications Bridge clients who have pinned a bridge to a certificate - fingerprint will be able to detect an MITMing adversary in timely - fashion. If after detection they act as an innocuous Internet + fingerprint will be able to detect an MITMing adversary in time. + If after detection they act as an innocuous Internet client, they can successfully remove suspicion from the SSL connection and subvert bridge detection. Pinning a certificate fingerprint and detecting an MITMing attacker - does not automatically aleviate suspicions from the bridge or the + does not automatically alleviate suspicions from the bridge or the client. Clients must have a behavior to follow after detecting the MITM attack so that they look like innocent Netizens. This proposal does not try to specify such a behavior. @@ -76,7 +76,7 @@ Status: Open Tor bridge implementations SHOULD provide a command line option that exports a fully equipped Bridge line containing the bridge - address and port, the link certificate fingerprint and any other + address and port, the link certificate fingerprint, and any other enabled Bridge options, so that bridge operators can easily send it to their users. diff --git a/proposals/203-https-frontend.txt b/proposals/203-https-frontend.txt index 8d3c2e3..26101b3 100644 --- a/proposals/203-https-frontend.txt +++ b/proposals/203-https-frontend.txt @@ -39,7 +39,7 @@ Goals and requirements: HTTPS client talking to an HTTPS server. We should make it impossible for an active attacker talking to the - server to tell a Tor bridge server from regular HTTPS server. + server to tell a Tor bridge server from a regular HTTPS server. We should make it impossible for an active attacker who can MITM the server to learn from the client whether it thought it was connecting @@ -205,7 +205,7 @@ Some considerations on distinguishability entirely.) Against an active non-MITM attacker, the best probing attacks will be - ones designed to provoke the system in acting in ways different from + ones designed to provoke the system into acting in ways different from those in which a webserver would act: responding earlier than a web server would respond, or later, or differently. We need to make sure that, whatever the front-end program is, it answers anything that diff --git a/proposals/ideas/xxx-port-knocking.txt b/proposals/ideas/xxx-port-knocking.txt index 85c27ec..bf5afa0 100644 --- a/proposals/ideas/xxx-port-knocking.txt +++ b/proposals/ideas/xxx-port-knocking.txt @@ -45,7 +45,7 @@ no longer possible to rebind to those lower ports after they are closed. Tor does not know about any OS level packet filtering. Currently there is no packet filters that understands the Tor network in real time. -1.x Possible partioning of users by bridge operator +1.x Possible partitioning of users by bridge operator Depending on implementation, it may be possible for bridge operators to uniquely identify users. This appears to be a general bridge issue when a

1 0

[torspec/master] add notes from other things that should be glossarized
by arma＠torproject.org 13 Aug '12

13 Aug '12

commit 79b1f8f47e7f47f7b9a2603a5aeead53404a1480 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Aug 13 16:11:19 2012 -0400 add notes from other things that should be glossarized --- glossary.txt | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/glossary.txt b/glossary.txt index c3fbf74..7fcd4fa 100644 --- a/glossary.txt +++ b/glossary.txt @@ -3,8 +3,8 @@ The Tor Project -Note: This document aims to specify terms, notations or phrases related to Tor and The -Tor Project. +Note: This document aims to specify terms, notations or phrases related +to Tor and The Tor Project. This glossary is not a design document; it is only a reference. @@ -20,3 +20,22 @@ This glossary is not a design document; it is only a reference. ORPort - Onion Router Port DirPort - Directory Port +0.2 Tor network components + + Relay, aka OR (onion router) - + Exit relay + Non-exit relay + Guard relay + Client, aka OP (onion proxy) + + Bridge - + Circuit - + Stream + Edge connection: + + TLS connection: + + Link handshake + Circuit handshake + +

1 0

[tor/master] Clarify the last changes message
by nickm＠torproject.org 13 Aug '12

13 Aug '12

commit c9d3e09cf8d7fb5e2ed1e9f7bb5e37a1a1319792 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 13 14:50:29 2012 -0400 Clarify the last changes message --- changes/no_malloc_roundup | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/changes/no_malloc_roundup b/changes/no_malloc_roundup index e7b4c8d..3a54fa7 100644 --- a/changes/no_malloc_roundup +++ b/changes/no_malloc_roundup @@ -5,4 +5,4 @@ implementations that provided these functions are also ones that are already efficient about not overallocation: they never got us more than 7 or so bytes per allocation. Removing them saves us - a little code complexity and a nontrivial amount of code complexity. + a little code complexity and a nontrivial amount of build complexity.

1 0

[tor/master] oops: changes file for f45cde05f934ee95e0002ff7d72f7006ce156a4c
by nickm＠torproject.org 13 Aug '12

13 Aug '12

commit 182f463be96aefc4a4ea2250f3a8fbf288aae80c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 13 14:37:53 2012 -0400 oops: changes file for f45cde05f934ee95e0002ff7d72f7006ce156a4c --- changes/no_malloc_roundup | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/changes/no_malloc_roundup b/changes/no_malloc_roundup new file mode 100644 index 0000000..e7b4c8d --- /dev/null +++ b/changes/no_malloc_roundup @@ -0,0 +1,8 @@ + o Code simplification and refactoring: + - Finally remove support for malloc_good_size and malloc_usable_size. + We had hoped that these functions would let us eke a little more + memory out of our malloc implementation. Unfortunately, the only + implementations that provided these functions are also ones that + are already efficient about not overallocation: they never got us + more than 7 or so bytes per allocation. Removing them saves us + a little code complexity and a nontrivial amount of code complexity.

1 0