April 2013 - tor-commits - lists.torproject.org

[torbrowser/maint-2.4] Fix a minor issue with the pipeline depth patch.
by mikeperry＠torproject.org 24 Apr '13

24 Apr '13

commit bedc9b317052aeabc1adca379acaba80634cab87 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jan 1 00:00:00 2013 -0800 Fix a minor issue with the pipeline depth patch. We were accidentally creating too many connections at once, which impacts pipelining. --- ...ize-HTTP-request-order-and-pipeline-depth.patch | 151 +++++++++++++++----- 1 files changed, 112 insertions(+), 39 deletions(-) diff --git a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch index a82e429..11d0e47 100644 --- a/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch +++ b/src/current-patches/firefox/0017-Randomize-HTTP-request-order-and-pipeline-depth.patch @@ -1,4 +1,4 @@ -From 6043bc14b28d49618e7882707c56b2fac4ada2a9 Mon Sep 17 00:00:00 2001 +From aa6534432718dae0e3810dc441fc797ecf809c6e Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue, 4 Dec 2012 17:38:51 -0800 Subject: [PATCH 17/28] Randomize HTTP request order and pipeline depth. @@ -36,15 +36,15 @@ request representation that will allow more requests to be packed inside Tor cells. If you have interest in evaluating SPDY in a study of Website Traffic Fingerprinting, please contact me. --- - netwerk/protocol/http/nsHttpConnectionMgr.cpp | 298 +++++++++++++++++-------- + netwerk/protocol/http/nsHttpConnectionMgr.cpp | 351 +++++++++++++++++-------- netwerk/protocol/http/nsHttpConnectionMgr.h | 15 +- netwerk/protocol/http/nsHttpHandler.h | 2 + netwerk/protocol/http/nsHttpPipeline.cpp | 62 ++++- netwerk/protocol/http/nsHttpPipeline.h | 3 + - 5 files changed, 282 insertions(+), 98 deletions(-) + 5 files changed, 327 insertions(+), 106 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp -index 133c301..69de433 100644 +index 133c301..c98894c 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -20,6 +20,8 @@ @@ -89,7 +89,7 @@ index 133c301..69de433 100644 } //----------------------------------------------------------------------------- -@@ -919,6 +932,8 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent) +@@ -919,22 +932,27 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent) nsHttpTransaction *trans; nsresult rv; bool dispatchedSuccessfully = false; @@ -98,7 +98,33 @@ index 133c301..69de433 100644 // iterate the pending list until one is dispatched successfully. Keep // iterating afterwards only until a transaction fails to dispatch. -@@ -953,16 +968,29 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent) + for (uint32_t i = 0; i < count; ++i) { + trans = ent->mPendingQ[i]; + +- // When this transaction has already established a half-open ++ // When this entry has already established a half-open + // connection, we want to prevent any duplicate half-open + // connections from being established and bound to this +- // transaction. Allow only use of an idle persistent connection +- // (if found) for transactions referred by a half-open connection. ++ // transaction. + bool alreadyHalfOpen = false; +- for (int32_t j = 0; j < ((int32_t) ent->mHalfOpens.Length()); ++j) { +- if (ent->mHalfOpens[j]->Transaction() == trans) { +- alreadyHalfOpen = true; +- break; ++ if (ent->SupportsPipelining()) { ++ alreadyHalfOpen = (ent->UnconnectedHalfOpens() > 0); ++ } else { ++ for (int32_t j = 0; j < ((int32_t) ent->mHalfOpens.Length()); ++j) { ++ if (ent->mHalfOpens[j]->Transaction() == trans) { ++ alreadyHalfOpen = true; ++ break; ++ } + } + } + +@@ -953,16 +971,29 @@ nsHttpConnectionMgr::ProcessPendingQForEntry(nsConnectionEntry *ent) dispatchedSuccessfully = true; count = ent->mPendingQ.Length(); --i; @@ -130,7 +156,18 @@ index 133c301..69de433 100644 return false; } -@@ -1263,7 +1291,7 @@ nsHttpConnectionMgr::MakeNewConnection(nsConnectionEntry *ent, +@@ -1247,6 +1278,10 @@ nsHttpConnectionMgr::MakeNewConnection(nsConnectionEntry *ent, + if (AtActiveConnectionLimit(ent, trans->Caps())) + return NS_ERROR_NOT_AVAILABLE; + ++#ifdef WTF_DEBUG ++ fprintf(stderr, "WTF: MakeNewConnection() is creating a transport (pipelines %d) for host %s\n", ++ ent->SupportsPipelining(), ent->mConnInfo->Host()); ++#endif + nsresult rv = CreateTransport(ent, trans, trans->Caps(), false); + if (NS_FAILED(rv)) { + /* hard failure */ +@@ -1263,7 +1298,7 @@ nsHttpConnectionMgr::MakeNewConnection(nsConnectionEntry *ent, } bool @@ -139,7 +176,7 @@ index 133c301..69de433 100644 nsHttpTransaction *trans, nsHttpTransaction::Classifier classification, uint16_t depthLimit) -@@ -1300,40 +1328,100 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, +@@ -1300,40 +1335,100 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, if (maxdepth < 2) return false; @@ -192,11 +229,11 @@ index 133c301..69de433 100644 + continue; + + numPipelines++; -+ -+ pipelineDepth = activeTrans->PipelineDepth(); -+ requestLen = pipeline->RequestDepth(); - if (maxdepth <= connLength) ++ pipelineDepth = activeTrans->PipelineDepth(); ++ requestLen = pipeline->RequestDepth(); ++ + totalDepth += pipelineDepth; + + // If we're within striking distance of our pipeline @@ -222,8 +259,7 @@ index 133c301..69de433 100644 + // queued already, or for which we can add multiple requests + if (requestLen + allClasses < mMaxOptimisticPipelinedRequests) + continue; - -- if (!bestConn) ++ + betterConns.AppendElement(conn); + + // Prefer a pipeline with the same classification if @@ -232,7 +268,8 @@ index 133c301..69de433 100644 + continue; + if (requestLen + sameClass < mMaxOptimisticPipelinedRequests) + continue; -+ + +- if (!bestConn) + bestConns.AppendElement(conn); + } + @@ -254,7 +291,7 @@ index 133c301..69de433 100644 activeTrans = bestConn->Transaction(); nsresult rv = activeTrans->AddTransaction(trans); -@@ -1343,6 +1431,15 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, +@@ -1343,6 +1438,15 @@ nsHttpConnectionMgr::AddToShortestPipeline(nsConnectionEntry *ent, LOG((" scheduling trans %p on pipeline at position %d\n", trans, trans->PipelinePosition())); @@ -270,7 +307,7 @@ index 133c301..69de433 100644 if ((ent->PipelineState() == PS_YELLOW) && (trans->PipelinePosition() > 1)) ent->SetYellowConnection(bestConn); return true; -@@ -1403,26 +1500,12 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1403,26 +1507,12 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, nsHttpTransaction::Classifier classification = trans->Classification(); uint8_t caps = trans->Caps(); @@ -299,7 +336,7 @@ index 133c301..69de433 100644 // step 0 // look for existing spdy connection - that's always best because it is // essentially pipelining without head of line blocking -@@ -1436,20 +1519,27 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1436,20 +1526,27 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, } } @@ -339,7 +376,7 @@ index 133c301..69de433 100644 nsRefPtr<nsHttpConnection> conn; while (!conn && (ent->mIdleConns.Length() > 0)) { conn = ent->mIdleConns[0]; -@@ -1483,21 +1573,8 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1483,21 +1580,8 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, } } @@ -363,7 +400,7 @@ index 133c301..69de433 100644 nsresult rv = MakeNewConnection(ent, trans); if (NS_SUCCEEDED(rv)) { // this function returns NOT_AVAILABLE for asynchronous connects -@@ -1510,17 +1587,16 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, +@@ -1510,17 +1594,16 @@ nsHttpConnectionMgr::TryDispatchTransaction(nsConnectionEntry *ent, return rv; } } @@ -390,13 +427,21 @@ index 133c301..69de433 100644 return NS_ERROR_NOT_AVAILABLE; /* queue it */ } -@@ -1590,10 +1666,20 @@ nsHttpConnectionMgr::DispatchAbstractTransaction(nsConnectionEntry *ent, +@@ -1590,10 +1673,28 @@ nsHttpConnectionMgr::DispatchAbstractTransaction(nsConnectionEntry *ent, if (!NS_SUCCEEDED(rv)) return rv; transaction = pipeline; +#ifdef WTF_DEBUG -+ fprintf(stderr, "WTF: New pipeline created from %d idle conns for host %s\n", -+ ent->mIdleConns.Length(), ent->mConnInfo->Host()); ++ if (HasPipelines(ent) && ++ ent->mPendingQ.Length()+1 < mMaxOptimisticPipelinedRequests) { ++ fprintf(stderr, "WTF-new-bug: New pipeline created from %d idle conns for host %s with %d/%d pending\n", ++ ent->mIdleConns.Length(), ent->mConnInfo->Host(), ent->mPendingQ.Length(), ++ mMaxOptimisticPipelinedRequests); ++ } else { ++ fprintf(stderr, "WTF-new: New pipeline created from %d idle conns for host %s with %d/%d pending\n", ++ ent->mIdleConns.Length(), ent->mConnInfo->Host(), ent->mPendingQ.Length(), ++ mMaxOptimisticPipelinedRequests); ++ } +#endif } else { @@ -411,9 +456,14 @@ index 133c301..69de433 100644 } nsRefPtr<nsConnectionHandle> handle = new nsConnectionHandle(conn); -@@ -1692,27 +1778,15 @@ nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans) +@@ -1691,28 +1792,20 @@ nsHttpConnectionMgr::ProcessNewTransaction(nsHttpTransaction *trans) + NS_ABORT_IF_FALSE(((int32_t)ent->mActiveConns.IndexOf(conn)) != -1, "Sticky Connection Not In Active List"); trans->SetConnection(nullptr); ++#ifdef WTF_TEST ++ fprintf(stderr, "WTF-bad: Sticky connection status on 1 transaction to host %s\n", ++ ent->mConnInfo->Host()); ++#endif rv = DispatchTransaction(ent, trans, conn); - } - else @@ -442,19 +492,34 @@ index 133c301..69de433 100644 } -@@ -2311,13 +2385,37 @@ nsHttpConnectionMgr::OnMsgSpeculativeConnect(int32_t, void *param) +@@ -2311,10 +2404,48 @@ nsHttpConnectionMgr::OnMsgSpeculativeConnect(int32_t, void *param) if (preferredEntry) ent = preferredEntry; -+ /* Only speculative connect if we're not pipelining */ - if (!ent->mIdleConns.Length() && !RestrictConnections(ent) && +- if (!ent->mIdleConns.Length() && !RestrictConnections(ent) && - !AtActiveConnectionLimit(ent, trans->Caps())) { -+ !HasPipelines(ent) && !AtActiveConnectionLimit(ent, trans->Caps())) { ++ if (ent->SupportsPipelining()) { ++ /* Only speculative connect if we're not pipelining and have no other pending ++ * unconnected half-opens.. */ ++ if (ent->UnconnectedHalfOpens() == 0 && ent->mIdleConns.Length() == 0 ++ && !RestrictConnections(ent) && !HasPipelines(ent) ++ && !AtActiveConnectionLimit(ent, trans->Caps())) { ++#ifdef WTF_DEBUG ++ fprintf(stderr, "WTF: Creating speculative connection because we have no pipelines\n"); ++#endif ++ CreateTransport(ent, trans, trans->Caps(), true); ++ } ++ } else if (!ent->mIdleConns.Length() && !RestrictConnections(ent) && ++ !AtActiveConnectionLimit(ent, trans->Caps())) { ++#ifdef WTF_DEBUG ++ fprintf(stderr, "WTF: Creating speculative connection because we can't pipeline\n"); ++#endif CreateTransport(ent, trans, trans->Caps(), true); } - } - - bool ++ ++} ++ ++bool +nsHttpConnectionMgr::HasPipelines(nsConnectionEntry *ent) +{ + uint32_t activeCount = ent->mActiveConns.Length(); @@ -475,13 +540,21 @@ index 133c301..69de433 100644 + return true; + } + return false; -+} -+ -+bool - nsHttpConnectionMgr::nsConnectionHandle::IsPersistent() - { - return mConn->IsPersistent(); -@@ -2852,9 +2950,13 @@ nsConnectionEntry::nsConnectionEntry(nsHttpConnectionInfo *ci) + } + + bool +@@ -2661,6 +2792,10 @@ nsHalfOpenSocket::OnOutputStreamReady(nsIAsyncOutputStream *out) + nsRefPtr<nsHttpTransaction> temp = dont_AddRef(mEnt->mPendingQ[index]); + mEnt->mPendingQ.RemoveElementAt(index); + gHttpHandler->ConnMgr()->AddActiveConn(conn, mEnt); ++#ifdef WTF_DEBUG ++ fprintf(stderr, "WTF: Speculative half-opened connection is now ready for %s (pipelines %d)\n", ++ mEnt->mConnInfo->Host(), mEnt->SupportsPipelining()); ++#endif + rv = gHttpHandler->ConnMgr()->DispatchTransaction(mEnt, temp, conn); + } + else { +@@ -2852,9 +2987,13 @@ nsConnectionEntry::nsConnectionEntry(nsHttpConnectionInfo *ci) { NS_ADDREF(mConnInfo); if (gHttpHandler->GetPipelineAggressive()) { @@ -496,7 +569,7 @@ index 133c301..69de433 100644 mInitialGreenDepth = mGreenDepth; memset(mPipeliningClassPenalty, 0, sizeof(int16_t) * nsAHttpTransaction::CLASS_MAX); } -@@ -2892,8 +2994,9 @@ nsConnectionEntry::OnPipelineFeedbackInfo( +@@ -2892,8 +3031,9 @@ nsConnectionEntry::OnPipelineFeedbackInfo( LOG(("Transaction completed at pipeline depth of %d. Host = %s\n", depth, mConnInfo->Host())); @@ -508,7 +581,7 @@ index 133c301..69de433 100644 } nsAHttpTransaction::Classifier classification; -@@ -2921,6 +3024,11 @@ nsConnectionEntry::OnPipelineFeedbackInfo( +@@ -2921,6 +3061,11 @@ nsConnectionEntry::OnPipelineFeedbackInfo( mPipelineState, mConnInfo->Host())); mPipelineState = PS_RED; mPipeliningPenalty = 0;

1 0

[tlsdate/master] Add TARGET_CYGWIN to ax_platform
by ioerror＠torproject.org 24 Apr '13

24 Apr '13

commit 27895e1358a05753cc5d198f4b4d9ec465eb7dbe Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Apr 23 18:48:45 2013 -0700 Add TARGET_CYGWIN to ax_platform --- m4/ax_platform.m4 | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 8822b86..172a4e5 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -36,7 +36,7 @@ AS_CASE([$target_os], [*mingw32*], [TARGET_WINDOWS="true" - AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows]) + AC_DEFINE([TARGET_OS_WINDOWS], [1], [Whether we are building for Windows]) AC_DEFINE([WINVER], [WindowsXP], [Version of Windows]) AC_DEFINE([_WIN32_WINNT], [0x0501], [Magical number to make things work]) AC_DEFINE([EAI_SYSTEM], [11], [Another magical number]) @@ -47,6 +47,9 @@ # define SHUT_RDWR SD_BOTH #endif ])], + [*CYGWIN_NT*], + [TARGET_CYGWIN="true" + AC_DEFINE([TARGET_OS_CYGWIN],[1],[Whether we build for Cygwin])], [*freebsd*], [TARGET_OS_FREEBSD="true" AC_DEFINE([TARGET_OS_FREEBSD],[1],[Whether we are building for FreeBSD])], @@ -64,13 +67,14 @@ AC_DEFINE([TARGET_OS_BSD],[1],[Whether we are building for some other *BSD])], [*solaris*],[AC_DEFINE([TARGET_OS_SOLARIS],[1],[Whether we are building for Solaris])], [*darwin*], - [TARGET_OSX="true" - AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])], - [*linux*], - [TARGET_LINUX="true" - AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) + [TARGET_OSX="true" + AC_DEFINE([TARGET_OS_OSX],[1],[Whether we build for OSX])], + [*linux*], + [TARGET_LINUX="true" + AC_DEFINE([TARGET_OS_LINUX],[1],[Whether we build for Linux])]) AM_CONDITIONAL([BUILD_WIN32],[test "x${TARGET_WINDOWS}" = "xtrue"]) + AM_CONDITIONAL([TARGET_CYGWIN],[test "x${TARGET_CYGWIN}" = "xtrue"]) AM_CONDITIONAL([TARGET_OSX],[test "x${TARGET_OSX}" = "xtrue"]) AM_CONDITIONAL([TARGET_LINUX],[test "x${TARGET_LINUX}" = "xtrue"]) AM_CONDITIONAL([TARGET_FREEBSD],[test "x${TARGET_OS_FREEBSD}" = "xtrue"])

1 0

[tlsdate/master] Add support for building with Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3)
by ioerror＠torproject.org 24 Apr '13

24 Apr '13

commit 455a90cf939aee0cbeb8e4186f84771895bfa959 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Apr 23 20:35:15 2013 -0700 Add support for building with Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3) --- INSTALL | 6 ++++++ autogen.sh | 6 ++++++ configure.ac | 17 +++++++++++++++++ m4/ax_platform.m4 | 2 +- src/compat/clock.h | 2 ++ src/compat/include.am | 4 ++++ src/include.am | 24 ++++++++++++++++++++++++ 7 files changed, 60 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index 5f34cd4..b0cc565 100644 --- a/INSTALL +++ b/INSTALL @@ -15,6 +15,7 @@ tlsdate should build and work on the following Operating Systems: OpenBSD 5.2 Gentoo 20130413 DragonFly BSD 3.3-DEVELOPMENT + Cygwin CYGWIN_NT-6.1 1.7.18(0.263/5/3) Please file a bug or email the tlsdate team if you have successfully built or use tlsdate on a platform that is not listed. We are specifically looking for @@ -95,6 +96,11 @@ On Arch Linux there is a PKGBUILD in the Arch User Repository: https://aur.archlinux.org/packages/tlsdate https://aur.archlinux.org/packages/tl/tlsdate/PKGBUILD +Cygwin requires that the user installs openssl-dev, gcc, pkg-config, libtool, automake, autoconf: + + ./configure + make + On Plan9 the start of building might look something like this: ip/ipconfig diff --git a/autogen.sh b/autogen.sh index 8981cef..51c926a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -23,4 +23,10 @@ then export WARNINGS fi +if [ $(uname) != "CYGWIN_NT-6.1" ]; +then + WARNINGS="" + export WARNINGS +fi + autoreconf --install --verbose --force diff --git a/configure.ac b/configure.ac index aa37bfa..696f8c4 100644 --- a/configure.ac +++ b/configure.ac @@ -273,6 +273,23 @@ case "$host" in [""|yes|no], [UNPRIV_GROUP="nogroup"], [*], [UNPRIV_GROUP=$with_unpriv_group]) AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) + ;; + *-cygwin*) + dnl This is for Cygwin + dnl Check for clock_gettime. Some systems put it into -lc, while + dnl others use -lrt. Try the first and fallback to the latter. + RT_LIB= + AC_CHECK_FUNC([clock_gettime], [:], + [AC_CHECK_LIB([rt], [clock_gettime], [RT_LIB="-lrt"], + [AC_MSG_ERROR([Your system lacks clock_gettime])])]) + AC_SUBST(RT_LIB) + AC_ARG_WITH([unpriv-group], + [AS_HELP_STRING([--with-unpriv-group=<group>], + [Group to drop privs to @<:@default: nogroup@:>@])]) + AS_CASE([$with_unpriv_group], + [""|yes|no], [UNPRIV_GROUP="nogroup"], + [*], [UNPRIV_GROUP=$with_unpriv_group]) + AC_DEFINE_UNQUOTED([UNPRIV_GROUP], ["${UNPRIV_GROUP}"], [Unprivileged group]) case "$host" in *-linux-androideabi) dnl This is for Android NDK as it is a special case of linux diff --git a/m4/ax_platform.m4 b/m4/ax_platform.m4 index 172a4e5..c613206 100644 --- a/m4/ax_platform.m4 +++ b/m4/ax_platform.m4 @@ -47,7 +47,7 @@ # define SHUT_RDWR SD_BOTH #endif ])], - [*CYGWIN_NT*], + [*cygwin*], [TARGET_CYGWIN="true" AC_DEFINE([TARGET_OS_CYGWIN],[1],[Whether we build for Cygwin])], [*freebsd*], diff --git a/src/compat/clock.h b/src/compat/clock.h index 2bcdb2e..7040d3c 100644 --- a/src/compat/clock.h +++ b/src/compat/clock.h @@ -36,6 +36,8 @@ struct tlsdate_time { mach_timespec_t tp; #elif _WIN32 void *tp; +#elif TARGET_OS_CYGWIN + struct timespec tp; #endif }; diff --git a/src/compat/include.am b/src/compat/include.am index 0713c14..b168c3a 100644 --- a/src/compat/include.am +++ b/src/compat/include.am @@ -40,4 +40,8 @@ endif endif endif +if TARGET_CYGWIN +src_compat_libtlsdate_compat_la_SOURCES+= src/compat/clock-linux.c +endif + src_compat_libtlsdate_compat_la_LIBADD+= @RT_LIB@ diff --git a/src/include.am b/src/include.am index 38da0c7..c5ea63b 100644 --- a/src/include.am +++ b/src/include.am @@ -96,6 +96,17 @@ endif endif endif +if TARGET_CYGWIN +bin_PROGRAMS+= src/tlsdate +bin_PROGRAMS+= src/tlsdate-helper + +src_conf_unittest_SOURCES = src/conf.c +src_conf_unittest_SOURCES+= src/conf-unittest.c +src_conf_unittest_SOURCES+= src/common/android.c +check_PROGRAMS+= src/conf_unittest +noinst_PROGRAMS+= src/conf_unittest +endif + if TARGET_OSX bin_PROGRAMS+= src/tlsdate bin_PROGRAMS+= src/tlsdate-helper @@ -244,6 +255,19 @@ endif endif endif +if TARGET_CYGWIN +if !POLARSSL +src_proxy_bio_unittest_LDADD = @SSL_LIBS@ +src_proxy_bio_unittest_SOURCES = src/proxy-bio.c +src_proxy_bio_unittest_SOURCES+= src/proxy-bio-unittest.c +src_proxy_bio_unittest_SOURCES+= src/test-bio.c +src_proxy_bio_unittest_SOURCES+= src/util.c +src_proxy_bio_unittest_SOURCES+= src/common/android.c +check_PROGRAMS+= src/proxy-bio_unittest +noinst_PROGRAMS+= src/proxy-bio_unittest +endif +endif + # We're not shipping headers noinst_HEADERS+= src/routeup.h noinst_HEADERS+= src/test_harness.h

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 23 Apr '13

23 Apr '13

commit 938e0193344a1a8b15c89c548cafa34b1fe301c1 Merge: 3aa9cc2 a630981 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Apr 23 16:31:05 2013 -0700 Merge branch 'maint-2.4' build-scripts/versions-alpha.mk | 5 +++-- build-scripts/versions.mk | 4 ++-- watch-scripts/fetch-thirdparty.sh | 13 +++++++++---- watch-scripts/verify-mirror.sh | 4 ++-- watch-scripts/versions.sh | 5 ++++- 5 files changed, 20 insertions(+), 11 deletions(-)

1 0

[torbrowser/master] Add tor-alpha to source mirroring.
by mikeperry＠torproject.org 23 Apr '13

23 Apr '13

commit a630981cb3feaf685e1f55e63a80de5f3b6c5136 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Apr 23 16:30:09 2013 -0700 Add tor-alpha to source mirroring. Also remove NoScript, because it is already HTTTPS and is not versioned (which messes with our verification ability). --- watch-scripts/fetch-thirdparty.sh | 13 +++++++++---- watch-scripts/verify-mirror.sh | 4 ++-- watch-scripts/versions.sh | 5 ++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/watch-scripts/fetch-thirdparty.sh b/watch-scripts/fetch-thirdparty.sh index 3244671..d9e2c19 100755 --- a/watch-scripts/fetch-thirdparty.sh +++ b/watch-scripts/fetch-thirdparty.sh @@ -25,14 +25,19 @@ QT_URL=ftp://ftp.qt.nokia.com/qt/source/${QT_PACKAGE} VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/${VI… LIBEVENT_URL=https://github.com/downloads/libevent/libevent/${LIBEVENT_PACK… TOR_URL=https://archive.torproject.org/tor-package-archive/${TOR_PACKAGE} +TOR_ALPHA_URL=https://archive.torproject.org/tor-package-archive/${TOR_ALPHA_PACKAGE} PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/${PIDGIN_PAC… FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FIRE… MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win3… TORBUTTON_URL=https://people.torproject.org/~mikeperry/${TORBUTTON_PACKAGE} -NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/${NOSCRIPT_PACKAGE} HTTPSEVERYWHERE_URL=https://www.eff.org/files/${HTTPSEVERYWHERE_PACKAGE} OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/… +# XXX: Because these filenames aren't versioned, we just fetch them directly +# from mozilla during build.. +#NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/${NOSCRIPT_PACKAGE} +#PDFJS_URL=https://addons.mozilla.org/firefox/downloads/latest/352704/${PDFJS_PACKAGE} + if [ ! -d sources ]; then mkdir sources fi @@ -40,7 +45,7 @@ fi cd sources # Get package files -for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR FIREFOX MOZBUILD TORBUTTON NOSCRIPT HTTPSEVERYWHERE OBFSPROXY +for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY do URL=${i}"_URL" PACKAGE=${i}"_PACKAGE" @@ -54,7 +59,7 @@ done # Get+verify sigs that exist # XXX: This doesn't cover everything. See #8525 -for i in TORBUTTON FIREFOX LIBEVENT TOR VIDALIA OBFSPROXY OPENSSL +for i in TORBUTTON FIREFOX LIBEVENT TOR TOR_ALPHA VIDALIA OBFSPROXY OPENSSL do URL=${i}"_URL" PACKAGE=${i}"_PACKAGE" @@ -76,7 +81,7 @@ done # Record sha256sums rm -f sha256sums.txt -for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR FIREFOX MOZBUILD TORBUTTON NOSCRIPT HTTPSEVERYWHERE OBFSPROXY +for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY do PACKAGE=${i}"_PACKAGE" sha256sum ${!PACKAGE} >> sha256sums.txt diff --git a/watch-scripts/verify-mirror.sh b/watch-scripts/verify-mirror.sh index 3627ab7..71d77a2 100755 --- a/watch-scripts/verify-mirror.sh +++ b/watch-scripts/verify-mirror.sh @@ -31,7 +31,7 @@ mkdir verify-sources cd verify-sources # Get package files from mirror -for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR FIREFOX MOZBUILD TORBUTTON NOSCRIPT HTTPSEVERYWHERE OBFSPROXY +for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY do PACKAGE=${i}"_PACKAGE" URL=${MIRROR_URL}${!PACKAGE} @@ -45,7 +45,7 @@ done # Get+verify sigs that exist # XXX: This doesn't cover everything. See #8525 -for i in TORBUTTON FIREFOX LIBEVENT TOR VIDALIA OBFSPROXY OPENSSL +for i in TORBUTTON FIREFOX LIBEVENT TOR TOR_ALPHA VIDALIA OBFSPROXY OPENSSL do PACKAGE=${i}"_PACKAGE" URL=${MIRROR_URL}${!PACKAGE} diff --git a/watch-scripts/versions.sh b/watch-scripts/versions.sh index 3559c96..ba0ef36 100755 --- a/watch-scripts/versions.sh +++ b/watch-scripts/versions.sh @@ -5,11 +5,12 @@ QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 +TOR_ALPHA_VER=0.2.4.12-alpha PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.5esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.1 -NOSCRIPT_VER=2.6.5.9 +NOSCRIPT_VER=2.6.5.9 # XXX: Unused :( HTTPSEVERYWHERE_VER=3.1.4 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 @@ -22,11 +23,13 @@ QT_PACKAGE=qt-everywhere-opensource-src-${QT_VER}.tar.gz VIDALIA_PACKAGE=vidalia-${VIDALIA_VER}.tar.gz LIBEVENT_PACKAGE=libevent-${LIBEVENT_VER}.tar.gz TOR_PACKAGE=tor-${TOR_VER}.tar.gz +TOR_ALPHA_PACKAGE=tor-${TOR_ALPHA_VER}.tar.gz PIDGIN_PACKAGE=pidgin-${PIDGIN_VER}.tar.bz2 FIREFOX_PACKAGE=firefox-${FIREFOX_VER}.source.tar.bz2 MOZBUILD_PACKAGE=MozillaBuildSetup-${MOZBUILD_VER}.exe TORBUTTON_PACKAGE=torbutton-${TORBUTTON_VER}.xpi NOSCRIPT_PACKAGE=addon-722-latest.xpi +PDFJS_PACKAGE=addon-352704-latest.xpi HTTPSEVERYWHERE_PACKAGE=https-everywhere-${HTTPSEVERYWHERE_VER}.xpi OBFSPROXY_PACKAGE=obfsproxy-${OBFSPROXY_VER}.tar.gz

1 0

[torbrowser/master] Fix versions files to directly download addons.
by mikeperry＠torproject.org 23 Apr '13

23 Apr '13

commit 9428f0d84eb0e9132f1b446a204cb594dd961933 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Apr 23 16:16:15 2013 -0700 Fix versions files to directly download addons. Addons aren't versioned and this doesn't play well with our mirror script. --- build-scripts/versions-alpha.mk | 5 +++-- build-scripts/versions.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index cbe6ecf..21b3c03 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.4.12-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.5.14 +LIBPNG_VER=1.5.15 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable @@ -52,7 +52,8 @@ PIDGIN_URL=$(TBB_THIRD_PARTY_MIRROR)$(PIDGIN_PACKAGE) FIREFOX_URL=$(TBB_THIRD_PARTY_MIRROR)$(FIREFOX_PACKAGE) MOZBUILD_URL=$(TBB_THIRD_PARTY_MIRROR)$(MOZBUILD_PACKAGE) TORBUTTON_URL=$(TBB_THIRD_PARTY_MIRROR)$(TORBUTTON_PACKAGE) -NOSCRIPT_URL=$(TBB_THIRD_PARTY_MIRROR)$(NOSCRIPT_PACKAGE) +NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE) +PDFJS_URL=https://addons.mozilla.org/firefox/downloads/latest/352704/$(PDFJS_PACKAGE) HTTPSEVERYWHERE_URL=$(TBB_THIRD_PARTY_MIRROR)$(HTTPSEVERYWHERE_PACKAGE) OBFSPROXY_URL=$(TBB_THIRD_PARTY_MIRROR)$(OBFSPROXY_PACKAGE) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index d3a85a3..0503930 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.3.25 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.5.14 +LIBPNG_VER=1.5.15 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable @@ -50,7 +50,7 @@ PIDGIN_URL=$(TBB_THIRD_PARTY_MIRROR)$(PIDGIN_PACKAGE) FIREFOX_URL=$(TBB_THIRD_PARTY_MIRROR)$(FIREFOX_PACKAGE) MOZBUILD_URL=$(TBB_THIRD_PARTY_MIRROR)$(MOZBUILD_PACKAGE) TORBUTTON_URL=$(TBB_THIRD_PARTY_MIRROR)$(TORBUTTON_PACKAGE) -NOSCRIPT_URL=$(TBB_THIRD_PARTY_MIRROR)$(NOSCRIPT_PACKAGE) +NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE) HTTPSEVERYWHERE_URL=$(TBB_THIRD_PARTY_MIRROR)$(HTTPSEVERYWHERE_PACKAGE) OBFSPROXY_URL=$(TBB_THIRD_PARTY_MIRROR)$(OBFSPROXY_PACKAGE)

1 0

[torbrowser/maint-2.4] Fix versions files to directly download addons.
by mikeperry＠torproject.org 23 Apr '13

23 Apr '13

commit 9428f0d84eb0e9132f1b446a204cb594dd961933 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Apr 23 16:16:15 2013 -0700 Fix versions files to directly download addons. Addons aren't versioned and this doesn't play well with our mirror script. --- build-scripts/versions-alpha.mk | 5 +++-- build-scripts/versions.mk | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index cbe6ecf..21b3c03 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.4.12-alpha ZLIB_VER=1.2.7 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.5.14 +LIBPNG_VER=1.5.15 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable @@ -52,7 +52,8 @@ PIDGIN_URL=$(TBB_THIRD_PARTY_MIRROR)$(PIDGIN_PACKAGE) FIREFOX_URL=$(TBB_THIRD_PARTY_MIRROR)$(FIREFOX_PACKAGE) MOZBUILD_URL=$(TBB_THIRD_PARTY_MIRROR)$(MOZBUILD_PACKAGE) TORBUTTON_URL=$(TBB_THIRD_PARTY_MIRROR)$(TORBUTTON_PACKAGE) -NOSCRIPT_URL=$(TBB_THIRD_PARTY_MIRROR)$(NOSCRIPT_PACKAGE) +NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE) +PDFJS_URL=https://addons.mozilla.org/firefox/downloads/latest/352704/$(PDFJS_PACKAGE) HTTPSEVERYWHERE_URL=$(TBB_THIRD_PARTY_MIRROR)$(HTTPSEVERYWHERE_PACKAGE) OBFSPROXY_URL=$(TBB_THIRD_PARTY_MIRROR)$(OBFSPROXY_PACKAGE) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index d3a85a3..0503930 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.3.25 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.5.14 +LIBPNG_VER=1.5.15 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable @@ -50,7 +50,7 @@ PIDGIN_URL=$(TBB_THIRD_PARTY_MIRROR)$(PIDGIN_PACKAGE) FIREFOX_URL=$(TBB_THIRD_PARTY_MIRROR)$(FIREFOX_PACKAGE) MOZBUILD_URL=$(TBB_THIRD_PARTY_MIRROR)$(MOZBUILD_PACKAGE) TORBUTTON_URL=$(TBB_THIRD_PARTY_MIRROR)$(TORBUTTON_PACKAGE) -NOSCRIPT_URL=$(TBB_THIRD_PARTY_MIRROR)$(NOSCRIPT_PACKAGE) +NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/$(NOSCRIPT_PACKAGE) HTTPSEVERYWHERE_URL=$(TBB_THIRD_PARTY_MIRROR)$(HTTPSEVERYWHERE_PACKAGE) OBFSPROXY_URL=$(TBB_THIRD_PARTY_MIRROR)$(OBFSPROXY_PACKAGE)

1 0

[torbrowser/maint-2.4] Add tor-alpha to source mirroring.
by mikeperry＠torproject.org 23 Apr '13

23 Apr '13

commit a630981cb3feaf685e1f55e63a80de5f3b6c5136 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Apr 23 16:30:09 2013 -0700 Add tor-alpha to source mirroring. Also remove NoScript, because it is already HTTTPS and is not versioned (which messes with our verification ability). --- watch-scripts/fetch-thirdparty.sh | 13 +++++++++---- watch-scripts/verify-mirror.sh | 4 ++-- watch-scripts/versions.sh | 5 ++++- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/watch-scripts/fetch-thirdparty.sh b/watch-scripts/fetch-thirdparty.sh index 3244671..d9e2c19 100755 --- a/watch-scripts/fetch-thirdparty.sh +++ b/watch-scripts/fetch-thirdparty.sh @@ -25,14 +25,19 @@ QT_URL=ftp://ftp.qt.nokia.com/qt/source/${QT_PACKAGE} VIDALIA_URL=https://archive.torproject.org/tor-package-archive/vidalia/${VI… LIBEVENT_URL=https://github.com/downloads/libevent/libevent/${LIBEVENT_PACK… TOR_URL=https://archive.torproject.org/tor-package-archive/${TOR_PACKAGE} +TOR_ALPHA_URL=https://archive.torproject.org/tor-package-archive/${TOR_ALPHA_PACKAGE} PIDGIN_URL=http://sourceforge.net/projects/pidgin/files/Pidgin/${PIDGIN_PAC… FIREFOX_URL=https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FIRE… MOZBUILD_URL=https://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win3… TORBUTTON_URL=https://people.torproject.org/~mikeperry/${TORBUTTON_PACKAGE} -NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/${NOSCRIPT_PACKAGE} HTTPSEVERYWHERE_URL=https://www.eff.org/files/${HTTPSEVERYWHERE_PACKAGE} OBFSPROXY_URL=https://archive.torproject.org/tor-package-archive/obfsproxy/… +# XXX: Because these filenames aren't versioned, we just fetch them directly +# from mozilla during build.. +#NOSCRIPT_URL=https://addons.mozilla.org/firefox/downloads/latest/722/${NOSCRIPT_PACKAGE} +#PDFJS_URL=https://addons.mozilla.org/firefox/downloads/latest/352704/${PDFJS_PACKAGE} + if [ ! -d sources ]; then mkdir sources fi @@ -40,7 +45,7 @@ fi cd sources # Get package files -for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR FIREFOX MOZBUILD TORBUTTON NOSCRIPT HTTPSEVERYWHERE OBFSPROXY +for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY do URL=${i}"_URL" PACKAGE=${i}"_PACKAGE" @@ -54,7 +59,7 @@ done # Get+verify sigs that exist # XXX: This doesn't cover everything. See #8525 -for i in TORBUTTON FIREFOX LIBEVENT TOR VIDALIA OBFSPROXY OPENSSL +for i in TORBUTTON FIREFOX LIBEVENT TOR TOR_ALPHA VIDALIA OBFSPROXY OPENSSL do URL=${i}"_URL" PACKAGE=${i}"_PACKAGE" @@ -76,7 +81,7 @@ done # Record sha256sums rm -f sha256sums.txt -for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR FIREFOX MOZBUILD TORBUTTON NOSCRIPT HTTPSEVERYWHERE OBFSPROXY +for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY do PACKAGE=${i}"_PACKAGE" sha256sum ${!PACKAGE} >> sha256sums.txt diff --git a/watch-scripts/verify-mirror.sh b/watch-scripts/verify-mirror.sh index 3627ab7..71d77a2 100755 --- a/watch-scripts/verify-mirror.sh +++ b/watch-scripts/verify-mirror.sh @@ -31,7 +31,7 @@ mkdir verify-sources cd verify-sources # Get package files from mirror -for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR FIREFOX MOZBUILD TORBUTTON NOSCRIPT HTTPSEVERYWHERE OBFSPROXY +for i in ZLIB OPENSSL LIBPNG QT VIDALIA LIBEVENT TOR TOR_ALPHA FIREFOX MOZBUILD TORBUTTON HTTPSEVERYWHERE OBFSPROXY do PACKAGE=${i}"_PACKAGE" URL=${MIRROR_URL}${!PACKAGE} @@ -45,7 +45,7 @@ done # Get+verify sigs that exist # XXX: This doesn't cover everything. See #8525 -for i in TORBUTTON FIREFOX LIBEVENT TOR VIDALIA OBFSPROXY OPENSSL +for i in TORBUTTON FIREFOX LIBEVENT TOR TOR_ALPHA VIDALIA OBFSPROXY OPENSSL do PACKAGE=${i}"_PACKAGE" URL=${MIRROR_URL}${!PACKAGE} diff --git a/watch-scripts/versions.sh b/watch-scripts/versions.sh index 3559c96..ba0ef36 100755 --- a/watch-scripts/versions.sh +++ b/watch-scripts/versions.sh @@ -5,11 +5,12 @@ QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable TOR_VER=0.2.3.25 +TOR_ALPHA_VER=0.2.4.12-alpha PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.5esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.1 -NOSCRIPT_VER=2.6.5.9 +NOSCRIPT_VER=2.6.5.9 # XXX: Unused :( HTTPSEVERYWHERE_VER=3.1.4 OTR_VER=3.2.0 OBFSPROXY_VER=0.1.4 @@ -22,11 +23,13 @@ QT_PACKAGE=qt-everywhere-opensource-src-${QT_VER}.tar.gz VIDALIA_PACKAGE=vidalia-${VIDALIA_VER}.tar.gz LIBEVENT_PACKAGE=libevent-${LIBEVENT_VER}.tar.gz TOR_PACKAGE=tor-${TOR_VER}.tar.gz +TOR_ALPHA_PACKAGE=tor-${TOR_ALPHA_VER}.tar.gz PIDGIN_PACKAGE=pidgin-${PIDGIN_VER}.tar.bz2 FIREFOX_PACKAGE=firefox-${FIREFOX_VER}.source.tar.bz2 MOZBUILD_PACKAGE=MozillaBuildSetup-${MOZBUILD_VER}.exe TORBUTTON_PACKAGE=torbutton-${TORBUTTON_VER}.xpi NOSCRIPT_PACKAGE=addon-722-latest.xpi +PDFJS_PACKAGE=addon-352704-latest.xpi HTTPSEVERYWHERE_PACKAGE=https-everywhere-${HTTPSEVERYWHERE_VER}.xpi OBFSPROXY_PACKAGE=obfsproxy-${OBFSPROXY_VER}.tar.gz

1 0

[tor-launcher/master] Removed .swp file.
by brade＠torproject.org 23 Apr '13

23 Apr '13

commit 592aacaa30e1016d15e1f6f595b372b12aa5bd47 Author: Kathy Brade <brade(a)torproject.org> Date: Tue Apr 23 17:35:32 2013 -0400 Removed .swp file. --- src/chrome/content/.network-settings.js.swp | Bin 32768 -> 0 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/.network-settings.js.swp b/src/chrome/content/.network-settings.js.swp deleted file mode 100644 index ce49066..0000000 Binary files a/src/chrome/content/.network-settings.js.swp and /dev/null differ

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 23 Apr '13

23 Apr '13

commit bc595cdff048e3c5f8823dd937686728862d5e52 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 23 21:15:59 2013 +0000 Update translations for torcheck_completed --- ar/torcheck.po | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ar/torcheck.po b/ar/torcheck.po index 38d2919..924a9bf 100644 --- a/ar/torcheck.po +++ b/ar/torcheck.po @@ -2,25 +2,26 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: -# Mohammed Al-Doub <voulnet(a)gmail.com>, 2012. -# OsamaK <osamak(a)gnu.org>, 2011. +# Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 +# Mohammed ALDOUB <voulnet(a)gmail.com>, 2012 +# OsamaK <osamak(a)gnu.org>, 2011 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-03-11 17:27+0000\n" -"Last-Translator: Mohammed Al-Doub <voulnet(a)gmail.com>\n" +"PO-Revision-Date: 2013-04-23 21:02+0000\n" +"Last-Translator: Sherief <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" "Language: ar\n" -"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" msgid "Congratulations. Your browser is configured to use Tor." -msgstr "تهانينا. متصفحك مضبوط على استخدام تور." +msgstr "تهانينا. متصفحك مضبوط لاستخدام تور." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " @@ -44,10 +45,10 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "اذا كنت تستخدم برنامجاً للدخول على تور، يرجى زيارة <a href=\"https://www.torproject.org/\"> موقع تور</a> و تحديداً <a href=\"https://www.torproject.org/docs/faq#DoesntWork\"> تعليمات ضبط البرامج للاتصال على تور</a>." +msgstr "إن كنت تحاول استخدام برنامج تور، يرجى زيارة <a href=\"https://www.torproject.org/\"> موقع تور</a> و تحديداً <a href=\"https://www.torproject.org/docs/faq#DoesntWork\"> تعليمات ضبط برنامج تور </a>." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "عذراً، لقد فشل طلبك أو تم تلقي استجابة غير متوقعة." +msgstr "عذراً، لقد فشل طلبك أو تم تلقي رد غير متوقع." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -55,4 +56,4 @@ msgid "" msgstr "خطأ مؤقت بالخدمة يمنعنا من تحديد اذا كان عنوان الانترنت الخاص بك هو <a href=\"https://www.torproject.org/\"> نقطة اتصال بتور</a>" msgid "Your IP address appears to be: " -msgstr "رقم الآي بي الخاص بك يظهر كالتالي:" +msgstr "عنوان الانترنت الخاص بك يظهر كالتالي:"

1 0