- tor-commits - lists.torproject.org

[torbrowser/master] update linux makefile with new libevent2 libraries and fix the XAUTHORITY bug
by erinn＠torproject.org 23 Mar '11

23 Mar '11

commit c66ed4c55395fe9f5e9e173a02854051c9bad6a3 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Mar 23 22:01:04 2011 +0100 update linux makefile with new libevent2 libraries and fix the XAUTHORITY bug --- build-scripts/linux.mk | 6 +++--- src/RelativeLink/RelativeLink.sh | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 463d972..f2dade8 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -332,9 +332,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.3 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-1.4.so.2 $(LIBEVENT)/libevent-1.4.so.2.1.3 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-1.4.so.2 $(LIBEVENT)/libevent_core-1.4.so.2.1.3 \ - $(LIBEVENT)/libevent_extra-1.4.so.2 $(LIBEVENT)/libevent_extra-1.4.so.2.1.3 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.0.1 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.0.1 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.0.1 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 5b83305..c5b7b28 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -14,6 +14,11 @@ if [ $1 ]; then printf "\nDebug enabled.\n\n" fi +if [ -z $XAUTHORITY]; then + XAUTHORITY=~/.Xauthority + export XAUTHORITY +fi + # Try to be agnostic to where we're being started from, chdir to where # the script is. mydir="$(dirname $0)"

1 0

[torbrowser/master] add the latest development https-everywhere to the windows tbb
by erinn＠torproject.org 23 Mar '11

23 Mar '11

commit a81f8e36a454373b8ec7d6b31148003dc9d6e8da Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Mar 23 22:01:53 2011 +0100 add the latest development https-everywhere to the windows tbb --- README | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/README b/README index 190a8e0..c631f12 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ Polipo 1.0.4.1 FirefoxPortable 3.6.16 \_ Firefox 3.6.16 \_ Torbutton 1.2.5 - \_ HTTPS Everywhere 0.9.9.development.3 + \_ HTTPS Everywhere 0.9.9.development.4 PidginPortable 2.7.4 \_ Pidgin 2.7.5 \_ OTR 3.2 @@ -333,3 +333,4 @@ Changelog 1.3.21: Released 2011-03-23 Update Firefox to 3.6.16 + Update HTTPS-Everywhere to 0.9.9.development.4

1 0

r24427: {website} fix ar translation of faq-abuse.wml so the website builds (website/trunk/docs/ar)
by Runa Sandvik 23 Mar '11

23 Mar '11

Author: runa Date: 2011-03-23 20:12:49 +0000 (Wed, 23 Mar 2011) New Revision: 24427 Modified: website/trunk/docs/ar/faq-abuse.wml Log: fix ar translation of faq-abuse.wml so the website builds Modified: website/trunk/docs/ar/faq-abuse.wml =================================================================== --- website/trunk/docs/ar/faq-abuse.wml 2011-03-23 20:12:31 UTC (rev 24426) +++ website/trunk/docs/ar/faq-abuse.wml 2011-03-23 20:12:49 UTC (rev 24427) @@ -117,7 +117,7 @@ <h3><a class="anchor" href="#ExitPolicies">كيف تطبق سياسات مخرج تور؟</a></h3> <p> - <a href="<page faq>#ExitPolicies">نُقلت الإجابة إلى صفحة الأسئلة المتكررة + <a href="<page docs/faq>#ExitPolicies">نُقلت الإجابة إلى صفحة الأسئلة المتكررة الجديدة</a> </p> @@ -306,7 +306,7 @@ <p> اقترح بعض مؤيدي تور أن نعيد تصميمه وأن نضع <a href="<page -faq>#Backdoor">بابًا خلفيًا</a> لكن توجد مشكلتان. الأولى أن ذلك يُضعف النظام +docs/faq>#Backdoor">بابًا خلفيًا</a> لكن توجد مشكلتان. الأولى أن ذلك يُضعف النظام إلى حد كبير لأن ربط جميع المستخدمين بنشاطاتهم في مكان مركزي ثغرة ممتازة جدًا لجميع المهاجمين؛ والآلية المطلوبة لتنفيذ ذلك بشكل صحيح صعبة وغير محسومة. الثانية أنه <a href="#WhatAboutCriminals">لن يتم القبض</a> على @@ -325,7 +325,7 @@ <h3><a class="anchor" href="#RemoveContent">أريد أن تتم إزالة بعض المحتويات من عنوان .onion.</a></h3> <p>لا يستضيف مشروع تور ولا يتحكم ولا يعرف مكان مالك أي عنوان .onion. إن عناوين -.onion عناوين <a href="<page hidden-services>">لخدمات مخفية</a> والاسم الذي +.onion عناوين <a href="<page docs/hidden-services>">لخدمات مخفية</a> والاسم الذي ينتهي ب.onion ما هو إلا مُعرّف للخدمة يُمنح تلقائيًا ويمكن أن تقع الخدمة على أي تحويلة أو عميل لتور في أي مكان في العالم. إن الخدمات المخفية مُصمّمة لحماية مستخدمي الخدمة ومزوديها من أن تكشف هويتهما أو مكانهما. إن تصميم

1 0

r24426: {website} fix ar translation of download.wml so the website builds (website/trunk/download/ar)
by Runa Sandvik 23 Mar '11

23 Mar '11

Author: runa Date: 2011-03-23 20:12:31 +0000 (Wed, 23 Mar 2011) New Revision: 24426 Modified: website/trunk/download/ar/download.wml Log: fix ar translation of download.wml so the website builds Modified: website/trunk/download/ar/download.wml =================================================================== --- website/trunk/download/ar/download.wml 2011-03-23 19:58:26 UTC (rev 24425) +++ website/trunk/download/ar/download.wml 2011-03-23 20:12:31 UTC (rev 24426) @@ -273,7 +273,7 @@ يحجب زر تور ملحقات المتصفح مثل Java و Flash و ActiveX و RealPlayer و Quicktime و Adobe PDF وغيرها، لإمكانية التلاعب بها لكشف عنوان IP الذي تتصل منه. هذا يعني على سبيل المثال أن YouTube معطل. إذا كنت بحاجة ماسة إلى -YouTube، يمكنك <a href="<page torbutton/faq>#noflash">إعادة ضبط زر تور</a> +YouTube، يمكنك <a href="<page torbutton/torbutton-faq>#noflash">إعادة ضبط زر تور</a> ليسمح به؛ لكن احذر من أنك قد تعرض نفسك لهجوم محتمل. أيضًا بعض الامتدادات مثل شريط أدوات غوغل تجمع بيانات عن المواقع التي تكتبها وقد تتجاوز تور و/أو تنشر معلومات حساسة. بعض الناس يفضلون استخدام متصفحين (أحدهما لتور والآخر للتصفح

1 0

r24425: {website} update the announcements with the FSF award. (website/trunk/en)
by Andrew Lewman 23 Mar '11

23 Mar '11

Author: phobos Date: 2011-03-23 19:58:26 +0000 (Wed, 23 Mar 2011) New Revision: 24425 Modified: website/trunk/en/index.wml Log: update the announcements with the FSF award. Modified: website/trunk/en/index.wml =================================================================== --- website/trunk/en/index.wml 2011-03-23 19:56:09 UTC (rev 24424) +++ website/trunk/en/index.wml 2011-03-23 19:58:26 UTC (rev 24425) @@ -125,6 +125,13 @@ <table> <tr> <td> + <div class="calendar"><span class="month">Mar</span><br><span class="day">23</span></div> + <p>The Tor Project wins the "Project of Social + Benefit" award from the Free Software Foundation + and GNU Project. We are honored to win this + award and to be listed amongst the former winners. <a + href="https://blog.torproject.org/blog/tor-project-receives-fsf-award">Read + more</a> about this award.</p> <div class="calendar"><span class="month">Feb</span><br><span class="day">23</span></div> <p>The latest stable Tor version, 0.2.1.30, is <a href="https://lists.torproject.org/pipermail/tor-announce/2011-February/000000.ht…">released</a>. @@ -135,13 +142,6 @@ will win the arms race long-term, but it buys us time until we roll out a better solution. </p> - <div class="calendar"><span class="month">Jan</span><br><span class="day">30</span></div> - <p>Tor helping with Egypt. Here's what we've learned <a - href="https://blog.torproject.org/blog/recent-events-egypt">about - recent events in Egypt</a>. And we're keeping our <a - href="<page press/inthemedia>">In the media</a> page - up to date with stories about how we're helping around - the world.</p> </td> </tr> </table>

1 0

r24424: {website} fix calendar background issue (website/trunk/css)
by Runa Sandvik 23 Mar '11

23 Mar '11

Author: runa Date: 2011-03-23 19:56:09 +0000 (Wed, 23 Mar 2011) New Revision: 24424 Modified: website/trunk/css/layout-rtl.css Log: fix calendar background issue Modified: website/trunk/css/layout-rtl.css =================================================================== --- website/trunk/css/layout-rtl.css 2011-03-23 19:40:39 UTC (rev 24423) +++ website/trunk/css/layout-rtl.css 2011-03-23 19:56:09 UTC (rev 24424) @@ -173,8 +173,7 @@ } .calendar { - background: url(../images/icon-calendar-flipped.jpg); - background-position: right top; + background: url("../images/icon-calendar-flipped.jpg") right top no-repeat; float: right; margin-left: 10px; }

1 0

r24423: {website} arabic translation of foot.wmi (website/trunk/include/ar)
by Runa Sandvik 23 Mar '11

23 Mar '11

Author: runa Date: 2011-03-23 19:40:39 +0000 (Wed, 23 Mar 2011) New Revision: 24423 Modified: website/trunk/include/ar/foot.wmi Log: arabic translation of foot.wmi Modified: website/trunk/include/ar/foot.wmi =================================================================== --- website/trunk/include/ar/foot.wmi 2011-03-23 18:45:02 UTC (rev 24422) +++ website/trunk/include/ar/foot.wmi 2011-03-23 19:40:39 UTC (rev 24423) @@ -8,7 +8,7 @@ docs/trademark-faq>">The Tor Project, Inc.</a> محتويات الموقع تخضع لرخصة <a href="http://creativecommons.org/licenses/by/3.0/us/">المشاع - الإبداعي: النسبة 3.0 الولايات المحدة</a> ما لم يُشر إلى خلاف + الإبداعي: النِّسبة 3.0 الولايات المتحدة</a> ما لم يُشر إلى خلاف ذلك.</p>  <div class="col"> - <h4>انضم</h4> + <h4>الانضمام</h4> <ul> <li><a href="<page donate/donate>">تبرع</a></li> <li><a href="<page docs/documentation>#MailingLists">القائمة البريدية</a></li> - <li><a href="<page getinvolved/mirrors>">مرايا</a></li> + <li><a href="<page getinvolved/mirrors>">المرايا</a></li> <li><a href="<page docs/hidden-services>">الخدمات المخفية</a></li> - <li><a href="<page getinvolved/translation>">ترجمات</a></li> - <li><a href="<page getinvolved/open-positions>">وظائف</a></li> + <li><a href="<page getinvolved/translation>">الترجمات</a></li> + <li><a href="<page getinvolved/open-positions>">الوظائف</a></li> </ul> </div>  @@ -77,9 +77,9 @@ <h4>Languages</h4> <: if (has_translations()) { :> <p> - This page is also available in the following languages: + هذه الصفحة متاحة أيضًا باللغات التالية: <: print list_translations() :>.<br /> - How to set <a href="http://www.debian.org/intro/cn#howtoset">the default document language</a>. + كيفية ضبط <a href="http://www.debian.org/intro/cn#howtoset">اللغة المبدئية للوثائق</a>. </p> <: }; :> </div> @@ -119,7 +119,7 @@ </select> <input class="go" type="submit" name="submit" value="اذهب"> </form> - <p>ألديك أسئلة عن هذا؟ زُر <a href="http://www.debian.org/intro/cn#howtoset">كيفية ضبط لغة المستندات المبدئية</a>.</p> + <p>ألديك أسئلة عن هذا؟ زُر <a href="http://www.debian.org/intro/cn#howtoset">كيفية ضبط اللغة المبدئية للوثائق</a>.</p> </div> --> </div>

1 0

r24422: {website} fix a missing "> in the arabic language faq-abuse page. (website/trunk/docs/ar)
by Andrew Lewman 23 Mar '11

23 Mar '11

Author: phobos Date: 2011-03-23 18:45:02 +0000 (Wed, 23 Mar 2011) New Revision: 24422 Modified: website/trunk/docs/ar/faq-abuse.wml Log: fix a missing "> in the arabic language faq-abuse page. Modified: website/trunk/docs/ar/faq-abuse.wml =================================================================== --- website/trunk/docs/ar/faq-abuse.wml 2011-03-23 16:18:32 UTC (rev 24421) +++ website/trunk/docs/ar/faq-abuse.wml 2011-03-23 18:45:02 UTC (rev 24422) @@ -150,7 +150,7 @@ <li>يمكن أن يتصل شخص ما بشبكة IRC ويزعج الناس. سوف يتلقى مزود خدمة الإنترنت لك بريدًا مهذبًا عن أن حاسوبك مُخترق و/أو مستغل للهجوم. [المنفذ 6667]</li> <li>يمكن أن يستخدم شخص ما تور لتنزيل فيلم Vin Diesel ليتقلى مزود خدمة الإنترنت -لك شكوى لخرق حقوق النشر. راجع <a href="<page eff/tor-dmca-response>قالب EFF +لك شكوى لخرق حقوق النشر. راجع <a href="<page eff/tor-dmca-response>">قالب EFF للرد على تهديدات خرق حقوق النشر لتور</a> والتي تشرح لمزود خدمة الإنترنت لك أن بإمكانه على الأرجح تجاهل الإشعار دون أي خطر قانوني. [منافذ متعددة]</li> </ul>

1 0

r24421: {arm} Fix bundle, thanks to Fabian Keil fix: preventing PROGRAM an (in arm/trunk/src: interface/connections util)
by Damian Johnson 23 Mar '11

23 Mar '11

Author: atagar Date: 2011-03-23 16:18:32 +0000 (Wed, 23 Mar 2011) New Revision: 24421 Modified: arm/trunk/src/interface/connections/connEntry.py arm/trunk/src/util/torTools.py Log: Fix bundle, thanks to Fabian Keil fix: preventing PROGRAM and CONTROL connections from being expanded (patch by Fabian Keil) fix: reversing src and dst addresses of PROGRAM and CONTROL connections (caught by Fabian Keil) fix: changing the 'APPLICATION' type to 'PROGRAM' since the previous label was too long (caught by Fabian Keil) fix: exit policy should only be respected for determining exit connections if the ORPort is set Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-03-23 15:15:43 UTC (rev 24420) +++ arm/trunk/src/interface/connections/connEntry.py 2011-03-23 16:18:32 UTC (rev 24421) @@ -14,14 +14,14 @@ # Outbound Relay connection, leaving us. # Exit Outbound relay connection leaving the Tor network. # Client Circuits for our client traffic. -# Application Socks connections using Tor. +# Program Socks connections for applications using Tor. # Directory Fetching tor consensus information. # Control Tor controller (arm, vidalia, etc). -Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "CLIENT", "APPLICATION", "DIRECTORY", "CONTROL") +Category = enum.Enum("INBOUND", "OUTBOUND", "EXIT", "CLIENT", "PROGRAM", "DIRECTORY", "CONTROL") CATEGORY_COLOR = {Category.INBOUND: "green", Category.OUTBOUND: "blue", Category.EXIT: "red", Category.CLIENT: "cyan", - Category.APPLICATION: "yellow", Category.DIRECTORY: "magenta", + Category.PROGRAM: "yellow", Category.DIRECTORY: "magenta", Category.CONTROL: "red"} # static data for listing format @@ -208,7 +208,7 @@ self.baseType = Category.INBOUND self.local.isORPort = True elif lPort == mySocksPort: - self.baseType = Category.APPLICATION + self.baseType = Category.PROGRAM elif lPort == myCtlPort: self.baseType = Category.CONTROL else: @@ -498,6 +498,16 @@ myExternalIpAddr = conn.getInfo("address", self.local.getIpAddr()) addrDiffer = myExternalIpAddr != self.local.getIpAddr() + # Expanding doesn't make sense, if the connection isn't actually + # going through Tor's external IP address. As there isn't a known + # method for checking if it is, we're checking the type instead. + # + # This isn't entirely correct. It might be a better idea to check if + # the source and destination addresses are both private, but that might + # not be perfectly reliable either. + + isExpansionType = not myType in (Category.PROGRAM, Category.CONTROL) + srcAddress = myExternalIpAddr + localPort src = "%-21s" % srcAddress # ip:port = max of 21 characters dst = "%-26s" % dstAddress # ip:port (xx) = max of 26 characters @@ -512,7 +522,7 @@ if isExpandedAddrVisible and CONFIG["features.connection.showColumn.fingerprint"]: isExpandedAddrVisible = width < usedSpace + 42 or width > usedSpace + 70 - if addrDiffer and isExpandedAddrVisible and self.includeExpandedIpAddr and CONFIG["features.connection.showColumn.expandedIp"]: + if addrDiffer and isExpansionType and isExpandedAddrVisible and self.includeExpandedIpAddr and CONFIG["features.connection.showColumn.expandedIp"]: # include the internal address in the src (extra 28 characters) internalAddress = self.local.getIpAddr() + localPort src = "%-21s --> %s" % (internalAddress, src) @@ -570,7 +580,7 @@ # pads dst entry to its max space dst = ("%%-%is" % (baseSpace - len(src))) % dst - if myType == Category.INBOUND: src, dst = dst, src + if myType in (Category.INBOUND, Category.PROGRAM, Category.CONTROL): src, dst = dst, src padding = " " * (width - usedSpace + LABEL_MIN_PADDING) return LABEL_FORMAT % (src, dst, etc, padding) Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-03-23 15:15:43 UTC (rev 24420) +++ arm/trunk/src/util/torTools.py 2011-03-23 16:18:32 UTC (rev 24421) @@ -784,31 +784,35 @@ result = None if self.isAlive(): - policyEntries = [] - for exitPolicy in self.getOption("ExitPolicy", [], True): - policyEntries += [policy.strip() for policy in exitPolicy.split(",")] - - # appends the default exit policy - defaultExitPolicy = self.getInfo("exit-policy/default") - - if defaultExitPolicy: - policyEntries += defaultExitPolicy.split(",") - - # construct the policy chain backwards - policyEntries.reverse() - - for entry in policyEntries: - result = ExitPolicy(entry, result) - - # Checks if we are rejecting private connections. If set, this appends - # 'reject private' and 'reject <my ip>' to the start of our policy chain. - isPrivateRejected = self.getOption("ExitPolicyRejectPrivate", True) - - if isPrivateRejected: - result = ExitPolicy("reject private", result) + if self.getOption("ORPort"): + policyEntries = [] + for exitPolicy in self.getOption("ExitPolicy", [], True): + policyEntries += [policy.strip() for policy in exitPolicy.split(",")] - myAddress = self.getInfo("address") - if myAddress: result = ExitPolicy("reject %s" % myAddress, result) + # appends the default exit policy + defaultExitPolicy = self.getInfo("exit-policy/default") + + if defaultExitPolicy: + policyEntries += defaultExitPolicy.split(",") + + # construct the policy chain backwards + policyEntries.reverse() + + for entry in policyEntries: + result = ExitPolicy(entry, result) + + # Checks if we are rejecting private connections. If set, this appends + # 'reject private' and 'reject <my ip>' to the start of our policy chain. + isPrivateRejected = self.getOption("ExitPolicyRejectPrivate", True) + + if isPrivateRejected: + result = ExitPolicy("reject private", result) + + myAddress = self.getInfo("address") + if myAddress: result = ExitPolicy("reject %s" % myAddress, result) + else: + # no ORPort is set so all relaying is disabled + result = ExitPolicy("reject *:*") self.connLock.release()

1 0

r24420: {website} sync my local working copy of publish with the world. (website/trunk)
by Andrew Lewman 23 Mar '11

23 Mar '11

Author: phobos Date: 2011-03-23 15:15:43 +0000 (Wed, 23 Mar 2011) New Revision: 24420 Modified: website/trunk/publish Log: sync my local working copy of publish with the world. Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2011-03-23 11:04:06 UTC (rev 24419) +++ website/trunk/publish 2011-03-23 15:15:43 UTC (rev 24420) @@ -1,13 +1,16 @@ #!/bin/sh set -e # stop if we encounter an error -svn update -make -j3 +make clean # clean cruft +svn update # get changes + +make -j3 # abuse the cores + # don't copy over stuff with permissions that make it useless chmod a+r * -R -rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum.torproject.org:/srv/www-master.torproject.org/htdocs +rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh vescum.torproject.org '/home/mirroradm/bin/trigger-mirrors' -ssh vescum.torproject.org chmod g+w -R /srv/www-master.torproject.org/htdocs +ssh vescum '/home/mirroradm/bin/trigger-mirrors' +ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs

1 0