[tor-commits] [user-manual/master] Remove reference to h...@rt.tp.o on bridges.page

[colin]

commit b04486a5d88190a9192d1960906c3c08ac56519c
Author: Colin Childs 
Date:   Wed Oct 19 00:25:44 2016 -0500

Remove reference to h...@rt.tp.o on bridges.page
---
 C/bridges.page | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/C/bridges.page b/C/bridges.page
index b62bc1a..ee4f38d 100644
--- a/C/bridges.page
+++ b/C/bridges.page
@@ -28,7 +28,7 @@ to obtain bridge addresses in order to use these transports.
  Getting bridge addresses
  
  Because bridge addresses are not public, you will need to request them
- yourself. You have three options:
+ yourself. You have two options:
  
 
 
@@ -44,12 +44,6 @@ to obtain bridge addresses in order to use these transports.
 address, or
 
   
-  
-
-Politely ask a human at h...@rt.torproject.org if neither of the first
-two methods works for you.
-
-  
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [user-manual/master] Fix spacing issue

[colin]

commit 0265ee606358fe38264dbda05a7845a024d02302
Author: Colin Childs 
Date:   Wed Oct 19 00:18:55 2016 -0500

Fix spacing issue
---
 C/downloading.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C/downloading.page b/C/downloading.page
index 51848d1..7894600 100644
--- a/C/downloading.page
+++ b/C/downloading.page
@@ -12,7 +12,7 @@
 
 The safest and simplest way to download Tor Browser is from the official
 Tor Project website at https://www.torproject.org. Your connection to
-the site will be secured usingHTTPS,
+the site will be secured using HTTPS,
 which makes it much harder for somebody to tamper with.
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Next release will be a minor version bump

[arlo]

commit cc6e1927f9ff91a073adc848685acd79d9296f35
Author: Arlo Breault 
Date:   Tue Oct 18 21:56:44 2016 -0700

Next release will be a minor version bump
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 68ec887..54d8dcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Tor Messenger 0.2.0b3 --
+Tor Messenger 0.3.0b1 --
  * All Platforms
* Use the tor-browser-45.4.0esr-6.0-1 branch on tor-browser
* Use the THUNDERBIRD_45_4_0_RELEASE tag on comm-esr45

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [user-manual/master] Correct number of pluggable transports on circumvention.page

[colin]

commit b50cfb6f4aa51c7dafdd9ad1f5a80efd798bf5de
Author: Colin Childs 
Date:   Tue Oct 18 23:54:22 2016 -0500

Correct number of pluggable transports on circumvention.page
---
 C/circumvention.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C/circumvention.page b/C/circumvention.page
index 2b1b540..cddf2b5 100644
--- a/C/circumvention.page
+++ b/C/circumvention.page
@@ -49,7 +49,7 @@ that are currently available.
   
   
   
-  Select “Connect with provided bridges”. Tor Browser currently has nine
+  Select “Connect with provided bridges”. Tor Browser currently has six
   pluggable transport options to choose from. See the section below for
   advice on which to select.
   

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [user-manual/master] Update circumvention.page with review feedback

[colin]

commit fd89d754b44d2aa5a8f5a766598f2550bb7066a7
Author: Colin Childs 
Date:   Tue Oct 18 23:50:34 2016 -0500

Update circumvention.page with review feedback
---
 C/circumvention.page | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/C/circumvention.page b/C/circumvention.page
index 0efd7b1..2b1b540 100644
--- a/C/circumvention.page
+++ b/C/circumvention.page
@@ -32,8 +32,8 @@ that are currently available.
 
   
   You can also configure pluggable transports while Tor Browser is
-  running, by clicking on the Torbutton menu and selecting “Tor Network
-  Settings”.
+  running, by clicking on the green onion near your address bar and
+  selecting “Tor Network Settings”.
   
  
 
@@ -67,8 +67,8 @@ individual circumstances.
 
 
 If you are trying to circumvent a blocked connection for the first time,
-you should try the different transports in the following order: obfs3,
-obfs4, ScrambleSuit, fte-ipv6, fte, meek-azure, meek-google, meek-amazon.
+you should try the different transports: obfs3, obfs4, ScrambleSuit, fte,
+meek-azure, meek-amazon.
 
 
 If you try all of these options, and none of them gets you online,

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor-messenger-build/master] Enable SVG

[arlo]

commit c3f190e3be82a2e12e236986474f8c270ba2635b
Author: Arlo Breault 
Date:   Tue Oct 18 21:34:58 2016 -0700

Enable SVG

 * TB's patch "Bug 12827: Create preference to disable SVG" adds a
   preference `svg.in-content.enabled` that we need to toggle in order
   for the scrollback to display after bringing a conversation back from
   on hold.
---
 .../instantbird/0001-Set-Tor-Messenger-preferences.patch| 13 -
 .../0002-Trac-16489-Prevent-account-autologin.patch |  2 +-
 ...ac-17896-Support-Special-Characters-input-prompt-o.patch |  2 +-
 ...ac-17494-Better-error-reporting-for-failed-outgoin.patch |  2 +-
 .../instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch  |  2 +-
 ...g-1218193-Fix-tab-strip-background-colour-on-OS-X..patch |  2 +-
 ...g-1246431-XMPP-createConversation-should-handle-in.patch |  2 +-
 ...g-1298574-Set-_userVCard-own-property-when-downloa.patch |  2 +-
 projects/instantbird/0009-XMPP-in-band-registration.patch   |  2 +-
 projects/instantbird/0010-Remove-search-from-UI.patch   |  2 +-
 projects/instantbird/0011-Add-Tor-Messenger-branding.patch  |  2 +-
 projects/instantbird/0012-Account-picture.patch |  2 +-
 projects/instantbird/0013-Modify-protocol-defaults.patch|  2 +-
 projects/instantbird/0014-Modify-IRC-defaults.patch |  2 +-
 projects/instantbird/0015-Modify-themes.patch   |  2 +-
 projects/instantbird/0016-Modify-XMPP-defaults.patch|  2 +-
 projects/instantbird/0017-Remove-logging-UI.patch   |  2 +-
 projects/instantbird/0018-Cert-override.patch   |  2 +-
 .../instantbird/0019-Display-all-traffic-over-Tor.patch |  2 +-
 projects/instantbird/0020-Trac-17480-Content-sink.patch |  2 +-
 20 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch 
b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index 96f3f5b..be19543 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,14 +1,14 @@
-From 81e0dfcc4197e987a8c64cce36b3cda48e84fe54 Mon Sep 17 00:00:00 2001
+From bfa4576ff8e6291a0cd293e05ac48b2a91c6a3c1 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh 
 Date: Mon, 10 Oct 2016 19:48:41 -0700
 Subject: [PATCH 01/20] Set Tor Messenger preferences
 
 ---
- im/app/profile/all-instantbird.js | 107 +++---
- 1 file changed, 87 insertions(+), 20 deletions(-)
+ im/app/profile/all-instantbird.js | 110 +++---
+ 1 file changed, 90 insertions(+), 20 deletions(-)
 
 diff --git a/im/app/profile/all-instantbird.js 
b/im/app/profile/all-instantbird.js
-index b7a3970..86f0559 100644
+index b7a3970..eb1423f 100644
 --- a/im/app/profile/all-instantbird.js
 +++ b/im/app/profile/all-instantbird.js
 @@ -28,7 +28,7 @@ pref("general.autoScroll", true);
@@ -110,7 +110,7 @@ index b7a3970..86f0559 100644
  
  // We have an Error Console menu item by default so let's display chrome 
errors
  pref("javascript.options.showInConsole", true);
-@@ -300,14 +302,79 @@ pref("browser.tabs.tabClipWidth", 140);
+@@ -300,14 +302,82 @@ pref("browser.tabs.tabClipWidth", 140);
  // 3  at the end of the tabstrip
  pref("browser.tabs.closeButtons", 1);
  
@@ -187,6 +187,9 @@ index b7a3970..86f0559 100644
 +// Disable hardware acceleration
 +pref("gfx.direct2d.disabled", true);
 +pref("layers.acceleration.disabled", true);
++// Enable SVG, for the TB patch,
++// "Bug 12827: Create preference to disable SVG."
++pref("svg.in-content.enabled", true);
 +
 +// Other Updates
 +pref("app.update.promptWaitTime", 3600);
diff --git 
a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch 
b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
index b3e386e..2ef8307 100644
--- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
+++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
@@ -1,4 +1,4 @@
-From 9cb6308cee43524e5b9368d6fc2f0b862dde0a3e Mon Sep 17 00:00:00 2001
+From 2f9785b7fb8fba1dae99f914a7500bac41d4a17b Mon Sep 17 00:00:00 2001
 From: Arlo Breault 
 Date: Mon, 16 Nov 2015 20:37:53 -0800
 Subject: [PATCH 02/20] Trac 16489: Prevent account autologin
diff --git 
a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
 
b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
index df362aa..100def4 100644
--- 
a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
+++ 
b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
@@ -1,4 +1,4 @@
-From ae27272d58c8f3654ba23b1329f07f0dc8fe5a10 Mon Sep 17 00:00:00 2001
+From fa84f77e4b3c3091aec5a479f862aa8cdb12de6a Mon Sep 17 00:00:00 2001
 From: aleth 
 Date: 

[tor-commits] [user-manual/master] Update first-time.page with review feedback

[colin]

commit c05ee61c0256bcde258e6536bc9467446889ee59
Author: Colin Childs 
Date:   Tue Oct 18 22:45:59 2016 -0500

Update first-time.page with review feedback
---
 C/first-time.page | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/C/first-time.page b/C/first-time.page
index ef4b239..e5c0b26 100644
--- a/C/first-time.page
+++ b/C/first-time.page
@@ -11,7 +11,7 @@
   
   
   When you run Tor Browser for the first time, you will see the Tor
-  Launcher window. This offers you the option to connect directly to the
+  Network Settings window. This offers you the option to connect directly to 
the
   Tor network, or to configure Tor Browser for your connection.
   
   
@@ -21,7 +21,7 @@
 
 
 
-In most cases, this option will allow you to connect to the Tor network
+In most cases, choosing "Connect" will allow you to connect to the Tor 
network
 without any further configuration. Once clicked, a status bar will
 appear, showing Tor’s connection progress. If you are on a relatively
 fast connection, but this bar seems to get stuck at a certain point,
@@ -36,7 +36,7 @@


If you know that your connection is censored, or uses a proxy, you should
-   select this option. Tor Launcher will take you through a series of
+   select this option. Tor Browser will take you through a series of
configuration options.


@@ -57,7 +57,7 @@
  this is not necessary. You will usually know if you need to answer
  “Yes”, as the same settings will be used for other browsers on your
  system. If possible, ask your network administrator for guidance. If
- your connection does not use a proxy, click “Connect”.
+ your connection does not use a proxy, click “Continue”.
  
  
  

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

[translation]

commit 76fc2886d03bca468414d94b94159ceada8f8e9e
Author: Translation commit bot 
Date:   Wed Oct 19 02:48:25 2016 +

Update translations for tor-messenger-ircproperties
---
 gd/irc.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gd/irc.properties b/gd/irc.properties
index a086a13..4738d08 100644
--- a/gd/irc.properties
+++ b/gd/irc.properties
@@ -205,4 +205,4 @@ tooltip.serverValue=%1$S (%2$S)
 # LOCALIZATION NOTE (yes, no):
 #  These are used to turn true/false values into a yes/no response.
 yes=Yes
-no=No
+no=Chan eil

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd

[translation]

commit 6caf67a0d6b0c5d6243cd344ca8ee238edc1e08a
Author: Translation commit bot 
Date:   Wed Oct 19 02:47:40 2016 +

Update translations for tor-messenger-authdtd
---
 gd/auth.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gd/auth.dtd b/gd/auth.dtd
index 8df5727..08beb5b 100644
--- a/gd/auth.dtd
+++ b/gd/auth.dtd
@@ -3,7 +3,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

[translation]

commit bfc31cd150f7ddf3e9b71e57a611006ad86ec2f7
Author: Translation commit bot 
Date:   Wed Oct 19 02:46:24 2016 +

Update translations for tor-launcher-network-settings
---
 gd/network-settings.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gd/network-settings.dtd b/gd/network-settings.dtd
index 0d2e9dc..cd71b2f 100644
--- a/gd/network-settings.dtd
+++ b/gd/network-settings.dtd
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/tails-greeter] Update translations for tails-greeter

[translation]

commit 3a4c6ba3ce0700a5be5600886a6a9de3dfdb5f60
Author: Translation commit bot 
Date:   Wed Oct 19 02:45:52 2016 +

Update translations for tails-greeter
---
 gd/gd.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gd/gd.po b/gd/gd.po
index 2095990..4ca3f22 100644
--- a/gd/gd.po
+++ b/gd/gd.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-05 19:35+0200\n"
+"POT-Creation-Date: 2016-09-02 14:43+0200\n"
 "PO-Revision-Date: 2012-10-03 17:36+\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: Gaelic, Scottish 
(http://www.transifex.com/otf/torproject/language/gd/)\n"
@@ -43,7 +43,7 @@ msgstr ""
 
 #: ../glade/persistencewindow.glade.h:7
 msgid "No"
-msgstr ""
+msgstr "Chan eil"
 
 #: ../glade/persistencewindow.glade.h:8
 msgid "Passphrase:"
@@ -145,7 +145,7 @@ msgstr ""
 msgid " "
 msgstr ""
 
-#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:43
+#: ../glade/langpanel.glade.h:2 ../tailsgreeter/langpanel.py:45
 msgid "Language"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgid ""
 "%(stderr)s"
 msgstr ""
 
-#: ../tailsgreeter/langpanel.py:140 ../tailsgreeter/langpanel.py:167
-#: ../tailsgreeter/langpanel.py:200
+#: ../tailsgreeter/langpanel.py:142 ../tailsgreeter/langpanel.py:169
+#: ../tailsgreeter/langpanel.py:202
 msgid "Other..."
 msgstr ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

[translation]

commit b20b084dc4be92094d322737956d7808d61c3537
Author: Translation commit bot 
Date:   Wed Oct 19 02:45:30 2016 +

Update translations for https_everywhere
---
 gd/ssl-observatory.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gd/ssl-observatory.dtd b/gd/ssl-observatory.dtd
index 69f1cfd..9498119 100644
--- a/gd/ssl-observatory.dtd
+++ b/gd/ssl-observatory.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/bridgedb] Update translations for bridgedb

[translation]

commit bbb1471a021deb710dcf34daa3f18ca984037faf
Author: Translation commit bot 
Date:   Wed Oct 19 02:45:04 2016 +

Update translations for bridgedb
---
 gd/LC_MESSAGES/bridgedb.po | 70 +++---
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/gd/LC_MESSAGES/bridgedb.po b/gd/LC_MESSAGES/bridgedb.po
index 8355c22..84d43a8 100644
--- a/gd/LC_MESSAGES/bridgedb.po
+++ b/gd/LC_MESSAGES/bridgedb.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-08-24 22:53+\n"
+"PO-Revision-Date: 2016-10-19 02:32+\n"
 "Last-Translator: Mairi Macleod \n"
 "Language-Team: Gaelic, Scottish 
(http://www.transifex.com/otf/torproject/language/gd/)\n"
 "MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr "Còd Tùsail"
 
 #: bridgedb/https/templates/base.html:85
 msgid "Changelog"
-msgstr ""
+msgstr "Clar-atharraich"
 
 #: bridgedb/https/templates/base.html:88
 msgid "Contact"
@@ -56,11 +56,11 @@ msgstr "Tagh e uile"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr ""
+msgstr "Seall Còd-QR"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr ""
+msgstr "Còd-QR airson do loidhnichean-drochaid"
 
 #. TRANSLATORS: Please translate this into some silly way to say
 #. "There was a problem!" in your language. For example,
@@ -69,11 +69,11 @@ msgstr ""
 #: bridgedb/https/templates/bridges.html:67
 #: bridgedb/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
-msgstr ""
+msgstr "Obh obh, brochan lom!"
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr ""
+msgstr "Tha e coltach gu bheil mearachd air a bhith ann a' faighinn do 
Chòd-QR."
 
 #: bridgedb/https/templates/bridges.html:73
 msgid ""
@@ -83,19 +83,19 @@ msgstr ""
 
 #: bridgedb/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
-msgstr ""
+msgstr "Chan eil drochaid sam bith ri fhaotainn an-drasta..."
 
 #: bridgedb/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr ""
+msgstr "'S dòcha gum bu chòir dhut %s dol air ais %s fheuchainn agus 
drochaid eadar-dhealaichte a thaghadh!"
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
-msgstr ""
+msgstr "Ceum %s1%s"
 
 #: bridgedb/https/templates/index.html:13
 #, python-format
@@ -105,22 +105,22 @@ msgstr ""
 #: bridgedb/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
-msgstr ""
+msgstr "Ceum %s2%s"
 
 #: bridgedb/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr ""
+msgstr "Faigh %s drochaidean %s"
 
 #: bridgedb/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
-msgstr ""
+msgstr "Ceum %s3%s"
 
 #: bridgedb/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
+msgstr "Nise %s cuir na drochaidean ri do Shealladair Tor %s"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -137,11 +137,11 @@ msgstr ""
 
 #: bridgedb/https/templates/options.html:86
 msgid "No"
-msgstr ""
+msgstr "Chan eil"
 
 #: bridgedb/https/templates/options.html:87
 msgid "none"
-msgstr ""
+msgstr "Chan eil gin"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -149,7 +149,7 @@ msgstr ""
 #: bridgedb/https/templates/options.html:124
 #, python-format
 msgid "%sY%ses!"
-msgstr ""
+msgstr "%sT%sha!"
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
@@ -157,7 +157,7 @@ msgstr ""
 #: bridgedb/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
-msgstr ""
+msgstr "%sF%saigh Drochaidean"
 
 #: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
@@ -165,7 +165,7 @@ msgstr ""
 
 #: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr ""
+msgstr "Seo do dhrochaidean:"
 
 #: bridgedb/strings.py:47
 #, python-format
@@ -182,7 +182,7 @@ msgstr ""
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
 #: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
-msgstr ""
+msgstr "Failte gu DrochaidDB!"
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
@@ -192,15 +192,15 @@ msgstr ""
 #: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
-msgstr ""
+msgstr "Hai, %s!"
 
 #: 

[tor-commits] [tor/master] Module-level docs for ext_orport and router.c

[nickm]

commit 54fda6b98ad79d3c2ce50858cea2226675ebfd4c
Author: Nick Mathewson 
Date:   Tue Oct 18 19:32:49 2016 -0400

Module-level docs for ext_orport and router.c
---
 src/or/ext_orport.c | 12 +++-
 src/or/router.c | 19 +--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c
index fb7add1..676adfd 100644
--- a/src/or/ext_orport.c
+++ b/src/or/ext_orport.c
@@ -4,7 +4,17 @@
 /**
  * \file ext_orport.c
  * \brief Code implementing the Extended ORPort.
-*/
+ *
+ * The Extended ORPort interface is used by pluggable transports to
+ * communicate additional information to a Tor bridge, including
+ * address information. For more information on this interface,
+ * see pt-spec.txt in torspec.git.
+ *
+ * There is no separate structure for extended ORPort connections; they use
+ * or_connection_t objects, and share most of their implementation with
+ * connection_or.c.  Once the handshake is done, an extended ORPort connection
+ * turns into a regular OR connection, using connection_ext_or_transition().
+ */
 
 #define EXT_ORPORT_PRIVATE
 #include "or.h"
diff --git a/src/or/router.c b/src/or/router.c
index 1ac8351..10498e8 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -37,8 +37,23 @@
 
 /**
  * \file router.c
- * \brief OR functionality, including key maintenance, generating
- * and uploading server descriptors, retrying OR connections.
+ * \brief Miscellaneous relay functionality, including RSA key maintenance,
+ * generating and uploading server descriptors, picking an address to
+ * advertise, and so on.
+ *
+ * This module handles the job of deciding whether we are a Tor relay, and if
+ * so what kind. (Mostly through functions like server_mode() that inspect an
+ * or_options_t, but in some cases based on our own capabilities, such as when
+ * we are deciding whether to be a directory cache in
+ * router_has_bandwidth_to_be_dirserver().)
+ *
+ * Also in this module are the functions to generate our own routerinfo_t and
+ * extrainfo_t, and to encode those to signed strings for upload to the
+ * directory authorities.
+ *
+ * This module also handles key maintenance for RSA and Curve25519-ntor keys,
+ * and for our TLS context. (These functions should eventually move to
+ * routerkeys.c along with the code that handles Ed25519 keys now.)
  **/
 
 //



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Document connection_or.c and connection.c at module level

[nickm]

commit d1b45786b1f91d3a65e88cc99c8021ea9d25a106
Author: Nick Mathewson 
Date:   Tue Oct 18 12:25:55 2016 -0400

Document connection_or.c and connection.c at module level
---
 src/or/connection.c| 44 
 src/or/connection_or.c | 11 +++
 2 files changed, 55 insertions(+)

diff --git a/src/or/connection.c b/src/or/connection.c
index 5ecd1ad..49cb78e 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -8,6 +8,50 @@
  * \file connection.c
  * \brief General high-level functions to handle reading and writing
  * on connections.
+ *
+ * Each connection (ideally) represents a TLS connection, a TCP socket, a unix
+ * socket, or a UDP socket on which reads and writes can occur.  (But see
+ * connection_edge.c for cases where connections can also represent streams
+ * that do not have a corresponding socket.)
+ *
+ * The module implements the abstract type, connection_t.  The subtypes are:
+ *  
+ *   listener_connection_t, implemented here in connection.c
+ *   dir_connection_t, implemented in directory.c
+ *   or_connection_t, implemented in connection_or.c
+ *   edge_connection_t, implemented in connection_edge.c, along with
+ *  its subtype(s):
+ *  entry_connection_t, also implemented in connection_edge.c
+ *  
+ *   control_connection_t, implemented in control.c
+ *  
+ *
+ * The base type implemented in this module is responsible for basic
+ * rate limiting, flow control, and marshalling bytes onto and off of the
+ * network (either directly or via TLS).
+ *
+ * Connections are registered with the main loop with connection_add(). As
+ * they become able to read or write register the fact with the event main
+ * loop by calling connection_watch_events(), connection_start_reading(), or
+ * connection_start_writing().  When they no longer want to read or write,
+ * they call connection_stop_reading() or connection_start_writing().
+ *
+ * To queue data to be written on a connection, call
+ * connection_write_to_buf().  When data arrives, the
+ * connection_process_inbuf() callback is invoked, which dispatches to a
+ * type-specific function (such as connection_edge_process_inbuf() for
+ * example). Connection types that need notice of when data has been written
+ * receive notification via connection_flushed_some() and
+ * connection_finished_flushing().  These functions all delegate to
+ * type-specific implementations.
+ *
+ * Additionally, beyond the core of connection_t, this module also implements:
+ * 
+ * Listeners, which wait for incoming sockets and launch connections
+ * Outgoing SOCKS proxy support
+ * Outgoing HTTP proxy support
+ * An out-of-sockets handler for dealing with socket exhaustion
+ * 
  **/
 
 #define CONNECTION_PRIVATE
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 72d8e13..267c32d 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -8,6 +8,17 @@
  * \file connection_or.c
  * \brief Functions to handle OR connections, TLS handshaking, and
  * cells on the network.
+ *
+ * An or_connection_t is a subtype of connection_t (as implemented in
+ * connection.c) that uses a TLS connection to send and receive cells on the
+ * Tor network. (By sending and receiving cells connection_or.c, it cooperates
+ * with channeltls.c to implement a the channel interface of channel.c.)
+ *
+ * Every OR connection has an underlying tortls_t object (as implemented in
+ * tortls.c) which it uses as its TLS stream.  It is responsible for
+ * sending and receiving cells over that TLS.
+ *
+ * This module also implements the client side of the v3 Tor link handshake,
  **/
 #include "or.h"
 #include "buffers.h"



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] changes file for module docs

[nickm]

commit 9a3adb07c49a522ffbefb009687c3bd9ee282d59
Author: Nick Mathewson 
Date:   Tue Oct 18 19:35:10 2016 -0400

changes file for module docs
---
 changes/more_module_docs | 4 
 1 file changed, 4 insertions(+)

diff --git a/changes/more_module_docs b/changes/more_module_docs
new file mode 100644
index 000..0066ddf
--- /dev/null
+++ b/changes/more_module_docs
@@ -0,0 +1,4 @@
+  o Documentation:
+- Module-level documentation for several more modules. Closes tickets 
+  19287 and 
+  19290.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Module documentation for circuitmux_ewma.c

[nickm]

commit 84829e336c3f72e4926e90d6f2e58eed0a538bce
Author: Nick Mathewson 
Date:   Tue Oct 18 11:28:40 2016 -0400

Module documentation for circuitmux_ewma.c
---
 src/or/circuitmux_ewma.c | 27 +--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c
index 13836cd..5c2ebde 100644
--- a/src/or/circuitmux_ewma.c
+++ b/src/or/circuitmux_ewma.c
@@ -4,6 +4,28 @@
 /**
  * \file circuitmux_ewma.c
  * \brief EWMA circuit selection as a circuitmux_t policy
+ *
+ * The "EWMA" in this module stands for the "exponentially weighted moving
+ * average" of the number of cells sent on each circuit.  The goal is to
+ * prioritize cells on circuits that have been quiet recently, by looking at
+ * those that have sent few cells over time, prioritizing recent times
+ * more than older ones.
+ *
+ * Specifically, a cell sent at time "now" has weight 1, but a time X ticks
+ * before now has weight ewma_scale_factor ^ X , where ewma_scale_factor is
+ * between 0.0 and 1.0.
+ *
+ * For efficiency, we do not re-scale these averages every time we send a
+ * cell: that would be horribly inefficient.  Instead, we we keep the cell
+ * count on all circuits on the same circuitmux scaled relative to a single
+ * tick.  When we add a new cell, we scale its weight depending on the time
+ * that has elapsed since the tick.  We do re-scale the circuits on the
+ * circuitmux periodically, so that we don't overflow double.
+ *
+ *
+ * This module should be used through the interfaces in circuitmux.c, which it
+ * implements.
+ *
  **/
 
 #define TOR_CIRCUITMUX_EWMA_C_
@@ -28,9 +50,10 @@
 
 /*** Some useful constant #defines ***/
 
-/*DOCDOC*/
+/** Any halflife smaller than this number of seconds is considered to be
+ * "disabled". */
 #define EPSILON 0.1
-/*DOCDOC*/
+/** The natural logarithm of 0.5. */
 #define LOG_ONEHALF -0.69314718055994529
 
 /*** EWMA structures ***/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Module docs for channel.c and channeltls.c

[nickm]

commit 35df48b189f513a456c90b5418ddab027079d507
Author: Nick Mathewson 
Date:   Mon Oct 17 14:23:53 2016 -0400

Module docs for channel.c and channeltls.c
---
 src/or/channel.c| 26 ++
 src/or/channeltls.c | 22 ++
 2 files changed, 48 insertions(+)

diff --git a/src/or/channel.c b/src/or/channel.c
index 6a78b21..f547aea 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -8,6 +8,32 @@
  * transfer cells from Tor instance to Tor instance.
  * Currently, there is only one implementation of the channel abstraction: in
  * channeltls.c.
+ *
+ * Channels are a higher-level abstraction than or_connection_t: In general,
+ * any means that two Tor relays use to exchange cells, or any means that a
+ * relay and a client use to exchange cells, is a channel.
+ *
+ * Channels differ from pluggable transports in that they do not wrap an
+ * underlying protocol over which cells are transmitted: they are the
+ * underlying protocol.
+ *
+ * This module defines the generic parts of the channel_t interface, and
+ * provides the machinery necessary for specialized implementations to be
+ * created.  At present, there is one specialized implementation in
+ * channeltls.c, which uses connection_or.c to send cells over a TLS
+ * connection.
+ *
+ * Every channel implementation is responsible for being able to transmit
+ * cells that are added to it with channel_write_cell() and related functions,
+ * and to receive incoming cells with the channel_queue_cell() and related
+ * functions.  See the channel_t documentation for more information.
+ *
+ * When new cells arrive on a channel, they are passed to cell handler
+ * functions, which can be set by channel_set_cell_handlers()
+ * functions. (Tor's cell handlers are in command.c.)
+ *
+ * Tor flushes cells to channels from relay.c in
+ * channel_flush_from_first_active_circuit().
  **/
 
 /*
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index 9c2411e..09cca95 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -6,6 +6,28 @@
  *
  * \brief A concrete subclass of channel_t using or_connection_t to transfer
  * cells between Tor instances.
+ *
+ * This module fills in the various function pointers in channel_t, to
+ * implement the channel_tls_t channels as used in Tor today.  These channels
+ * are created from channel_tls_connect() and
+ * channel_tls_handle_incoming(). Each corresponds 1:1 to or_connection_t
+ * object, as implemented in connection_or.c.  These channels transmit cells
+ * to the underlying or_connection_t by calling
+ * connection_or_write_*_cell_to_buf(), and receive cells from the underlying
+ * or_connection_t when connection_or_process_cells_from_inbuf() calls
+ * channel_tls_handle_*_cell().
+ *
+ * Here we also implement the server (responder) side of the v3+ Tor link
+ * handshake, which uses CERTS and AUTHENTICATE cell to negotiate versions,
+ * exchange expected and observed IP and time information, and bootstrap a
+ * level of authentication higher than we have gotten on the raw TLS
+ * handshake.
+ *
+ * NOTE: Since there is currently only one type of channel, there are probably
+ * more than a few cases where functionality that is currently in
+ * channeltls.c, connection_or.c, and channel.c ought to be divided up
+ * differently.  The right time to do this is probably whenever we introduce
+ * our next channel type.
  **/
 
 /*



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Turn replaycache.c module doc into doxygen

[nickm]

commit 439654012964fa8cd4e2dac926e245295c6b
Author: Nick Mathewson 
Date:   Tue Oct 18 12:31:50 2016 -0400

Turn replaycache.c module doc into doxygen
---
 src/or/replaycache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/replaycache.c b/src/or/replaycache.c
index c17cba5..8290fa6 100644
--- a/src/or/replaycache.c
+++ b/src/or/replaycache.c
@@ -1,7 +1,7 @@
  /* Copyright (c) 2012-2016, The Tor Project, Inc. */
  /* See LICENSE for licensing information */
 
-/*
+/**
  * \file replaycache.c
  *
  * \brief Self-scrubbing replay cache for rendservice.c



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Turn circuitmux.c comments into module docs.

[nickm]

commit 56933787d55f74c667f364ae58cd277d79d9fc27
Author: Nick Mathewson 
Date:   Tue Oct 18 11:17:34 2016 -0400

Turn circuitmux.c comments into module docs.
---
 src/or/circuitmux.c | 89 -
 1 file changed, 47 insertions(+), 42 deletions(-)

diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c
index 038904e..96a3647 100644
--- a/src/or/circuitmux.c
+++ b/src/or/circuitmux.c
@@ -4,49 +4,20 @@
 /**
  * \file circuitmux.c
  * \brief Circuit mux/cell selection abstraction
- **/
-
-#include "or.h"
-#include "channel.h"
-#include "circuitlist.h"
-#include "circuitmux.h"
-#include "relay.h"
-
-/*
- * Private typedefs for circuitmux.c
- */
-
-/*
- * Map of muxinfos for circuitmux_t to use; struct is defined below (name
- * of struct must match HT_HEAD line).
- */
-typedef struct chanid_circid_muxinfo_map chanid_circid_muxinfo_map_t;
-
-/*
- * Hash table entry (yeah, calling it chanid_circid_muxinfo_s seems to
- * break the hash table code).
- */
-typedef struct chanid_circid_muxinfo_t chanid_circid_muxinfo_t;
-
-/*
- * Anything the mux wants to store per-circuit in the map; right now just
- * a count of queued cells.
- */
-
-typedef struct circuit_muxinfo_s circuit_muxinfo_t;
-
-/*
- * Structures for circuitmux.c
- */
-
-/*
- * A circuitmux is a collection of circuits; it tracks which subset
- * of the attached circuits are 'active' (i.e., have cells available
- * to transmit) and how many cells on each.  It expoes three distinct
+ *
+ * A circuitmux is responsible for MUltipleXing all of the
+ * circuits that are writing on a single channel. It keeps track of which of
+ * these circuits has something to write (aka, "active" circuits), and which
+ * one should write next.  A circuitmux corresponds 1:1 with a channel.
+ *
+ * There can be different implementations of the circuitmux's rules (which
+ * decide which circuit is next to write).
+ *
+ * A circuitmux exposes three distinct
  * interfaces to other components:
  *
  * To channels, which each have a circuitmux_t, the supported operations
- * are:
+ * (invoked from relay.c) are:
  *
  *   circuitmux_get_first_active_circuit():
  *
@@ -74,7 +45,9 @@ typedef struct circuit_muxinfo_s circuit_muxinfo_t;
  *
  *   circuitmux_set_num_cells():
  *
- * Set the circuitmux's cell counter for this circuit.
+ * Set the circuitmux's cell counter for this circuit. One of
+ * circuitmuc_clear_num_cells() or circuitmux_set_num_cells() MUST be
+ * called when the number of cells queued on a circuit changes.
  *
  * See circuitmux.h for the circuitmux_policy_t data structure, which contains
  * a table of function pointers implementing a circuit selection policy, and
@@ -94,7 +67,39 @@ typedef struct circuit_muxinfo_s circuit_muxinfo_t;
  *
  * Install a policy on a circuitmux_t; the appropriate callbacks will be
  * made to attach all existing circuits to the new policy.
- *
+ **/
+
+#include "or.h"
+#include "channel.h"
+#include "circuitlist.h"
+#include "circuitmux.h"
+#include "relay.h"
+
+/*
+ * Private typedefs for circuitmux.c
+ */
+
+/*
+ * Map of muxinfos for circuitmux_t to use; struct is defined below (name
+ * of struct must match HT_HEAD line).
+ */
+typedef struct chanid_circid_muxinfo_map chanid_circid_muxinfo_map_t;
+
+/*
+ * Hash table entry (yeah, calling it chanid_circid_muxinfo_s seems to
+ * break the hash table code).
+ */
+typedef struct chanid_circid_muxinfo_t chanid_circid_muxinfo_t;
+
+/*
+ * Anything the mux wants to store per-circuit in the map; right now just
+ * a count of queued cells.
+ */
+
+typedef struct circuit_muxinfo_s circuit_muxinfo_t;
+
+/*
+ * Structures for circuitmux.c
  */
 
 struct circuitmux_s {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torsocks/master] Update version to v2.2.0

[dgoulet]

commit e54d80bc9595beeceac637b03e5c5395c07e62f7
Author: David Goulet 
Date:   Tue Oct 18 12:44:01 2016 -0400

Update version to v2.2.0

Signed-off-by: David Goulet 
---
 ChangeLog| 17 +
 configure.ac |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0890707..e90ea19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2016-10-18 torsocks 2.2.0
+   * Use xz for dist tarball now
+   * Remove TODO as we use the bugtracker for those
+   * execve: only include xattr.h for Linux
+   * syscall: sched_getaffinity is only Linux
+   * close: Prefix debug messages with [close]
+   * Add check for Apple's System Integrity Protection.
+   * Quote the non-zero length check of $getcap.
+   * compat: Fix bad use of defined macro for OS X
+   * Use AC_USE_SYSTEM_EXTENSIONS to try to use POSIX extensions
+   * log: Fix whitespace in log.h
+   * syscall: OS X doesn't support sched_getaffinity()
+   * Fix memcpy buffer overrun in gethostbyaddr()
+   * Fix memcpy() buffer overrun in gethostbyname()
+   * Fix typo: catched -> caught
+   * syscall: Whitelist sched_getaffinity(2)
+
 2016-06-21 torsocks 2.2.0-rc1
* Return connection refused on deny by ruleset error
* Fix wrong tor_address check for NULL
diff --git a/configure.ac b/configure.ac
index d5e3200..f5dd992 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 ##
 
 # Process this file with autoconf to produce a configure script.
-AC_INIT([torsocks], 
[2.2.0-rc1],[dgou...@torproject.org],[],[https://torproject.org])
+AC_INIT([torsocks], 
[2.2.0],[dgou...@torproject.org],[],[https://torproject.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 # Get hostname and other information.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torsocks/master] Use xz for dist tarball now

[dgoulet]

commit d5d7eaab8fb82353079180e71884c37f6e2e882c
Author: David Goulet 
Date:   Tue Oct 18 12:39:02 2016 -0400

Use xz for dist tarball now

Signed-off-by: David Goulet 
---
 .gitignore   | 1 +
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 89ed3e9..6d80fe1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ Makefile.in
 *.loT
 *.info
 *.bz2
+*.xz
 *.tar
 aclocal.m4
 autom4te.cache/
diff --git a/configure.ac b/configure.ac
index a77a2de..d5e3200 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_CONFIG_HEADER([include/config.h])
 AC_USE_SYSTEM_EXTENSIONS
 
 # Automake initialization
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip])
 
 # Silent compilation. Easier to spot errors!
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torsocks/master] Remove TODO as we use the bugtracker for those

[dgoulet]

commit b92860d5979de1902707b638933d315e3313848f
Author: David Goulet 
Date:   Tue Oct 18 12:25:58 2016 -0400

Remove TODO as we use the bugtracker for those

Signed-off-by: David Goulet 
---
 TODO | 94 
 1 file changed, 94 deletions(-)

diff --git a/TODO b/TODO
deleted file mode 100644
index ab593f4..000
--- a/TODO
+++ /dev/null
@@ -1,94 +0,0 @@
-Version 2.0

-* Support res_* API
-* Check recvmmsg() FD passing on Unix socket and for TCP socket, clean exit
-* Support the complete list of dangerous syscall numbers with syscall()
-* Clean configure.ac - DONE
-* Create new updated torsocks shell script - DONE
-* Rename torsocks to something more meaningful
-* Add tests and a bunch load of them!
-
-Version 1.0

-
-- is_local is fishy. investigate.
-- Resolve race condition where hooks are called before dlsym'd. - DONE
-- Need to ensure even locally destined dns requests are caught and handled
-  appropriately.
-Do we need to detect TCP dns requests in connect() to ensure
-they are rejected/re-routed?
-Where do such requests come from? res_*?
-How can we re-route them to Tor? DNSPort? 
-- kill ICMP as well.
-
-Version 1.1

-* What about the isc library calls like res_init and so on?  How widely are
-  they use?  Does this present a more elegant way to implement this stuff?
-
-* It should be possible to make this thread-safe with --enable-threads.
-
-* Add stdout and stderr messages that enable a parent program (such as TorK)
-  to monitor torsocks for errors.
-
-* Merge dsocks so we support BSD (http://monkey.org/~dugsong/dsocks/)
-
---
-
-DONE:
-
-* In fact, one could modify tsocks further to play nicely with tor.  For 
-  example, you could prevent nonlocal UDP traffic from being sent at all,
-  and so on. - DONE
-
-  - Addressed in connect(), sendto() and sendmsg().
-  - Don't need to handle send(), since that is handled in connect().
-
-
-
-Original TODO:
-
-- Update FAQ to include information about the install location of the
-  tsocks library
-
-- Install the saveme and validateconf binaries, presumably with new names
-
-
-TODO
-
-
-* Think about how local names get resolved.  Is it important?  For example,
-  if I 'telnet localhost' which using tordns, what should happen?  Should
-  we search through /etc/hosts ourselves or what?  
-  
-* What about the isc library calls like res_init and so on?  How widely are
-  they use?  Does this present a more elegant way to implement this stuff?
-
-* Perhaps intercept res_query etc and try to do something appropriate.
-
-* It should be possible to make this thread-safe with --enable-threads.
-
-* validateconf needs to be updated to understand (and show information about)
-  the tordns configuration options.
-
-* Perhaps intercept reverse name lookups? - DONE - getaddrbyhost (RH)
-
-* In fact, one could modify tsocks further to play nicely with tor.  For 
-  example, you could prevent nonlocal UDP traffic from being sent at all,
-  and so on.
-
-The 'tordns' feature for tsocks only works with applications using the 
-standard c library name lookup mechanisms.
-
-Some programs roll their own name lookup functions, for example, 'curl' 
-uses the 'adns' library, not the standard c library name lookup calls.  
-In this case, you'll still be leaking DNS requests.
-
-However, it seems that most programs which go to the trouble of implementing 
-asynchronous DNS requests or doing other tricky things have native SOCKS or
-HTTP proxy support.  
-
-Requests for reverse name lookups are not intercepted.
-
-Finally, the tsocks library is NOT thread-safe, with or without this patch.
-You should not 'torify' multithreaded applications.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torsocks/master] execve: only include xattr.h for Linux

[dgoulet]

commit d13977e5a4b5666eaae23deb4ffdfa313da7c078
Author: David Goulet 
Date:   Tue Oct 18 10:38:28 2016 -0400

execve: only include xattr.h for Linux

Signed-off-by: David Goulet 
---
 src/lib/execve.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/execve.c b/src/lib/execve.c
index ec3d12c..3504b9b 100644
--- a/src/lib/execve.c
+++ b/src/lib/execve.c
@@ -16,7 +16,6 @@
  */
 
 #include 
-#include 
 #include 
 
 #include "torsocks.h"
@@ -43,6 +42,7 @@ check_cap_suid(const char *filename)
 
 /* Capabilities as such are just on Linux. */
 #ifdef __linux__
+#include 
static const char *sec_cap = "security.capability";
ssize_t len = getxattr(filename, sec_cap, NULL, 0);
if (len > 0) {

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torsocks/master] syscall: sched_getaffinity is only Linux

[dgoulet]

commit b0174499cf17cf153d76b26dadf6b57e18d4a801
Author: David Goulet 
Date:   Tue Oct 18 10:32:43 2016 -0400

syscall: sched_getaffinity is only Linux

Signed-off-by: David Goulet 
---
 src/common/compat.h | 3 ---
 src/lib/syscall.c   | 5 ++---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/common/compat.h b/src/common/compat.h
index 0eb4fda..aa1da28 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -194,9 +194,6 @@ void tsocks_once(tsocks_once_t *o, void 
(*init_routine)(void));
 #define TSOCKS_NR_GETPEERNAME SYS_getpeername
 #define TSOCKS_NR_LISTENSYS_listen
 #define TSOCKS_NR_RECVMSG   SYS_recvmsg
-#if !defined(__darwin__)
-#define TSOCKS_NR_SCHED_GETAFFINITY SYS_sched_getaffinity
-#endif /* ! __darwin__ */
 
 #endif /* __FreeBSD__, __FreeBSD_kernel__, __darwin__, __NetBSD__ */
 
diff --git a/src/lib/syscall.c b/src/lib/syscall.c
index ff5a4da..789c380 100644
--- a/src/lib/syscall.c
+++ b/src/lib/syscall.c
@@ -164,7 +164,8 @@ static LIBC_RECVMSG_RET_TYPE handle_recvmsg(va_list args)
return tsocks_recvmsg(sockfd, msg, flags);
 }
 
-#if !defined(__darwin__)
+#if defined(__linux__)
+
 /*
  * Handle sched_getaffinity(2) syscall.
  * NOTE: ffmpeg is one of the application that needs this one on the
@@ -183,9 +184,7 @@ static LIBC_SYSCALL_RET_TYPE 
handle_sched_getaffinity(va_list args)
return tsocks_libc_syscall(TSOCKS_NR_SCHED_GETAFFINITY, pid, cpusetsize,
mask);
 }
-#endif /* ! __darwin__ */
 
-#if defined(__linux__)
 /*
  * Handle gettid(2) syscall.
  */

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Add my new GPG key to signing-keys.wml

[nickm]

commit 9cf47c85b3d9568ab39e82b98c6d4f3b81f8c49f
Author: Nick Mathewson 
Date:   Tue Oct 18 08:59:37 2016 -0400

Add my new GPG key to signing-keys.wml
---
 docs/en/signing-keys.wml | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index 343f266..4b8e6d4 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -19,8 +19,9 @@
 Nicolas Vigier (0xD0220E4B) and Linus Nordberg (0x23291265)
 sign the Tor Browser releases.
 Roger Dingledine (0x28988BF5 and 0x19F78451) or Nick Mathewson
-(0x165733EA, or its subkey 0x8D29319A) sign the Tor source code
-tarballs.
+ (0xFE43009C4607B1FB with signing key 0x6AFEE6D49E92B601)
+ sign the Tor source code tarballs. (Nick's old key was 0x165733EA
+ with signing key 0x8D29319A; it signed older tarballs.)
 Tor Project Archive (0x886DDD89) signs the deb.torproject.org
 repositories and archives.
 Damian Johnson (0x9ABBEEC6) signs Arm releases.
@@ -43,6 +44,15 @@
 uid  Roger Dingledine a...@torproject.org
 sub   4096R/B0E5067D 2015-06-10 [expires: 2016-06-09]
 
+pub   4096R/FE43009C4607B1FB 2016-09-21 [expires: 2019-09-21]
+  Key fingerprint = 2133 BC60 0AB1 33E1 D826  D173 FE43 009C 4607 B1FB
+uid  Nick Mathewson ni...@alum.mit.edu
+uid  Nick Mathewson ni...@wangafu.net
+uid  Nick Mathewson ni...@torproject.org
+uid  Nick Mathewson ni...@freehaven.net
+sub   4096R/6AFEE6D49E92B601 2016-09-23 [expires: 2018-09-23]
+sub   4096R/91DDED0286AC8BFF 2016-09-23 [expires: 2018-09-23]
+
 pub   3072R/165733EA 2004-07-03
   Key fingerprint = B35B F85B F194 89D0 4E28  C33C 2119 4EBB 1657 33EA
 uid  Nick Mathewson ni...@alum.mit.edu

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

[translation]

commit 66a69d96e8e06fa4b2bce28cc98209324dea6ad0
Author: Translation commit bot 
Date:   Tue Oct 18 10:46:33 2016 +

Update translations for torbutton-torbuttondtd
---
 es/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index d8ecdd1..6fb2131 100644
--- a/es/torbutton.dtd
+++ b/es/torbutton.dtd
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torbutton/master] Bug 20388: Consolidate Services.prefs references

[gk]

commit 2cef75462d4a7f640b4586c0cd50b6679b9fc7ae
Author: Arthur Edelstein 
Date:   Mon Oct 17 14:21:36 2016 -0700

Bug 20388: Consolidate Services.prefs references
---
 src/chrome/content/torbutton.js | 76 -
 1 file changed, 29 insertions(+), 47 deletions(-)

diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index fa4009a..5b03ba0 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -18,9 +18,10 @@ const k_tb_tor_check_failed_topic = 
"Torbutton:TorCheckFailed";
 const k_tb_tor_resize_warn_pref =
   "extensions.torbutton.startup_resize_period"
 
+var m_tb_prefs = Services.prefs;
+
 // status
 var m_tb_wasinited = false;
-var m_tb_prefs = false;
 var m_tb_plugin_string = false;
 var m_tb_is_main_window = false;
 var m_tb_hidden_browser = false;
@@ -50,16 +51,12 @@ var torbutton_window_pref_observer =
 {
 register: function()
 {
-var pref_service = 
Components.classes["@mozilla.org/preferences-service;1"]
- 
.getService(Components.interfaces.nsIPrefBranchInternal);
-this._branch = 
pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal);
-this._branch.addObserver("extensions.torbutton", this, false);
+m_tb_prefs.addObserver("extensions.torbutton", this, false);
 },
 
 unregister: function()
 {
-if (!this._branch) return;
-this._branch.removeObserver("extensions.torbutton", this);
+m_tb_prefs.removeObserver("extensions.torbutton", this);
 },
 
 // topic:   what event occurred
@@ -84,21 +81,18 @@ var torbutton_unique_pref_observer =
 register: function()
 {
 this.forced_ua = false;
-var pref_service = 
Components.classes["@mozilla.org/preferences-service;1"]
- 
.getService(Components.interfaces.nsIPrefBranchInternal);
-this._branch = 
pref_service.QueryInterface(Components.interfaces.nsIPrefBranchInternal);
-this._branch.addObserver("extensions.torbutton", this, false);
-this._branch.addObserver("network.cookie", this, false);
-this._branch.addObserver("browser.privatebrowsing.autostart", this, 
false);
-this._branch.addObserver("javascript", this, false);
-this._branch.addObserver("gfx", this, false);
-this._branch.addObserver("noscript", this, false);
-this._branch.addObserver("media", this, false);
-this._branch.addObserver("mathml", this, false);
-this._branch.addObserver("svg", this, false);
-this._branch.addObserver("plugin.disable", this, false);
-this._branch.addObserver("privacy.thirdparty.isolate", this, false);
-this._branch.addObserver("privacy.resistFingerprinting", this, false);
+m_tb_prefs.addObserver("extensions.torbutton", this, false);
+m_tb_prefs.addObserver("network.cookie", this, false);
+m_tb_prefs.addObserver("browser.privatebrowsing.autostart", this, 
false);
+m_tb_prefs.addObserver("javascript", this, false);
+m_tb_prefs.addObserver("gfx", this, false);
+m_tb_prefs.addObserver("noscript", this, false);
+m_tb_prefs.addObserver("media", this, false);
+m_tb_prefs.addObserver("mathml", this, false);
+m_tb_prefs.addObserver("svg", this, false);
+m_tb_prefs.addObserver("plugin.disable", this, false);
+m_tb_prefs.addObserver("privacy.thirdparty.isolate", this, false);
+m_tb_prefs.addObserver("privacy.resistFingerprinting", this, false);
 
 // We observe xpcom-category-entry-added for plugins w/ 
Gecko-Content-Viewers
 var observerService = Cc["@mozilla.org/observer-service;1"].
@@ -108,16 +102,15 @@ var torbutton_unique_pref_observer =
 
 unregister: function()
 {
-if (!this._branch) return;
-this._branch.removeObserver("extensions.torbutton", this);
-this._branch.removeObserver("network.cookie", this);
-this._branch.removeObserver("browser.privatebrowsing.autostart", this);
-this._branch.removeObserver("javascript", this);
-this._branch.removeObserver("gfx", this);
-this._branch.removeObserver("noscript", this);
-this._branch.removeObserver("media", this);
-this._branch.removeObserver("mathml", this);
-this._branch.removeObserver("svg", this);
+m_tb_prefs.removeObserver("extensions.torbutton", this);
+m_tb_prefs.removeObserver("network.cookie", this);
+m_tb_prefs.removeObserver("browser.privatebrowsing.autostart", this);
+m_tb_prefs.removeObserver("javascript", this);
+m_tb_prefs.removeObserver("gfx", this);
+m_tb_prefs.removeObserver("noscript", this);
+m_tb_prefs.removeObserver("media", this);
+m_tb_prefs.removeObserver("mathml", this);
+m_tb_prefs.removeObserver("svg", this);
 
 var 

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

[translation]

commit 8b437fcc0e6be6742960f61de526bc69aa803913
Author: Translation commit bot 
Date:   Tue Oct 18 08:47:42 2016 +

Update translations for torbutton-torbuttondtd
---
 ach/torbutton.dtd | 1 -
 ady/torbutton.dtd | 1 -
 af/torbutton.dtd  | 1 -
 ak/torbutton.dtd  | 1 -
 am/torbutton.dtd  | 1 -
 ar/torbutton.dtd  | 1 -
 arn/torbutton.dtd | 1 -
 ast/torbutton.dtd | 1 -
 az/torbutton.dtd  | 1 -
 ba/torbutton.dtd  | 1 -
 be/torbutton.dtd  | 1 -
 bg/torbutton.dtd  | 1 -
 bn/torbutton.dtd  | 1 -
 bn_BD/torbutton.dtd   | 1 -
 bn_IN/torbutton.dtd   | 1 -
 bo/torbutton.dtd  | 1 -
 br/torbutton.dtd  | 1 -
 brx/torbutton.dtd | 1 -
 bs/torbutton.dtd  | 1 -
 ca/torbutton.dtd  | 1 -
 ceb/torbutton.dtd | 1 -
 cs/torbutton.dtd  | 1 -
 csb/torbutton.dtd | 1 -
 cv/torbutton.dtd  | 1 -
 cy/torbutton.dtd  | 1 -
 da/torbutton.dtd  | 1 -
 de/torbutton.dtd  | 1 -
 dz/torbutton.dtd  | 1 -
 el/torbutton.dtd  | 1 -
 en/torbutton.dtd  | 1 -
 en_GB/torbutton.dtd   | 1 -
 eo/torbutton.dtd  | 1 -
 es/torbutton.dtd  | 1 -
 es_AR/torbutton.dtd   | 1 -
 es_CL/torbutton.dtd   | 1 -
 es_CO/torbutton.dtd   | 1 -
 es_MX/torbutton.dtd   | 1 -
 et/torbutton.dtd  | 1 -
 eu/torbutton.dtd  | 1 -
 fa/torbutton.dtd  | 1 -
 fi/torbutton.dtd  | 1 -
 fil/torbutton.dtd | 1 -
 fo/torbutton.dtd  | 1 -
 fr/torbutton.dtd  | 1 -
 fr_CA/torbutton.dtd   | 1 -
 fur/torbutton.dtd | 1 -
 fy/torbutton.dtd  | 1 -
 ga/torbutton.dtd  | 1 -
 gd/torbutton.dtd  | 1 -
 gl/torbutton.dtd  | 1 -
 gu/torbutton.dtd  | 1 -
 gu_IN/torbutton.dtd   | 1 -
 gun/torbutton.dtd | 1 -
 ha/torbutton.dtd  | 1 -
 he/torbutton.dtd  | 1 -
 hi/torbutton.dtd  | 1 -
 hr/torbutton.dtd  | 1 -
 hr_HR/torbutton.dtd   | 1 -
 ht/torbutton.dtd  | 1 -
 hu/torbutton.dtd  | 1 -
 hy/torbutton.dtd  | 1 -
 ia/torbutton.dtd  | 1 -
 id/torbutton.dtd  | 1 -
 is/torbutton.dtd  | 1 -
 it/torbutton.dtd  | 1 -
 ja/torbutton.dtd  | 1 -
 jv/torbutton.dtd  | 1 -
 ka/torbutton.dtd  | 1 -
 kk/torbutton.dtd  | 1 -
 km/torbutton.dtd  | 1 -
 kn/torbutton.dtd  | 1 -
 ko/torbutton.dtd  | 1 -
 ko_KR/torbutton.dtd   | 1 -
 ku/torbutton.dtd  | 1 -
 ku_IQ/torbutton.dtd   | 1 -
 kw/torbutton.dtd  | 1 -
 ky/torbutton.dtd  | 1 -
 la/torbutton.dtd  | 1 -
 lb/torbutton.dtd  | 1 -
 lg/torbutton.dtd  | 1 -
 ln/torbutton.dtd  | 1 -
 lo/torbutton.dtd  | 1 -
 lt/torbutton.dtd  | 1 -
 lv/torbutton.dtd  | 1 -
 mg/torbutton.dtd  | 1 -
 mi/torbutton.dtd  | 1 -
 mk/torbutton.dtd  | 1 -
 ml/torbutton.dtd  | 1 -
 mn/torbutton.dtd  | 1 -
 mr/torbutton.dtd  | 1 -
 ms_MY/torbutton.dtd   | 1 -
 mt/torbutton.dtd  | 1 -
 my/torbutton.dtd  | 1 -
 nah/torbutton.dtd | 1 -
 nap/torbutton.dtd | 1 -
 nb/torbutton.dtd  | 1 -
 nds/torbutton.dtd | 1 -
 ne/torbutton.dtd  | 1 -
 nl/torbutton.dtd  | 1 -
 nl_BE/torbutton.dtd   | 1 -
 nn/torbutton.dtd  | 1 -
 nso/torbutton.dtd | 1 -
 oc/torbutton.dtd  | 1 -
 om/torbutton.dtd  | 1 -
 or/torbutton.dtd  | 1 -
 pa/torbutton.dtd  | 1 -
 pap/torbutton.dtd | 1 -
 pl/torbutton.dtd  | 1 -
 pms/torbutton.dtd | 1 -
 ps/torbutton.dtd  | 1 -
 pt/torbutton.dtd  | 1 -
 pt_BR/torbutton.dtd   | 1 -
 ro/torbutton.dtd  | 1 -
 ru/torbutton.dtd  | 1 -
 ru@petr1708/torbutton.dtd | 1 -
 scn/torbutton.dtd | 1 -
 sco/torbutton.dtd | 1 -
 si_LK/torbutton.dtd   | 1 -
 sk/torbutton.dtd  | 1 -
 sk_SK/torbutton.dtd   | 1 -
 sl/torbutton.dtd  | 1 -
 sl_SI/torbutton.dtd   | 1 -
 sn/torbutton.dtd  | 1 -
 so/torbutton.dtd  | 1 -
 son/torbutton.dtd | 1 -
 sq/torbutton.dtd  | 1 -
 sr/torbutton.dtd  | 1 -
 sr@latin/torbutton.dtd| 1 -
 st/torbutton.dtd  | 1 -
 su/torbutton.dtd  | 1 -
 sv/torbutton.dtd  | 1 -
 sw/torbutton.dtd  | 1 -
 szl/torbutton.dtd | 1 -
 ta/torbutton.dtd  | 1 -
 te/torbutton.dtd  | 1 -
 te_IN/torbutton.dtd   | 1 -
 tg/torbutton.dtd  | 1 -
 th/torbutton.dtd  | 1 -
 ti/torbutton.dtd  | 1 -
 tk/torbutton.dtd  | 1 -
 tr/torbutton.dtd  | 1 -
 tzm/torbutton.dtd | 1 -
 ug@Arab/torbutton.dtd | 1 -
 uk/torbutton.dtd  | 1 -
 ur/torbutton.dtd  | 1 -
 

[tor-commits] [tor-browser-bundle/master] Bug 20184: OS X builds are still not reproducible

[gk]

commit 04a9af0eb1e6466ce6a7007a46d73fb7a38442e8
Author: Georg Koppen 
Date:   Sun Oct 9 11:12:43 2016 +

Bug 20184: OS X builds are still not reproducible

We ecountered on some machines failures to reproduce OS X builds.
The investigation seems to indicate that our old toolchain plays a
crucial role in this.

This patch replaces this old toolchain with a more modern clang/cctools
for building the tor part of the bundle. Resorting to `faketime` again
was necessary to cope with inserted timestamps.
---
 gitian/descriptors/mac/gitian-tor.yml | 44 +++
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/gitian/descriptors/mac/gitian-tor.yml 
b/gitian/descriptors/mac/gitian-tor.yml
index f2f4b01..ee1d848 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -4,19 +4,21 @@ distro: "debian"
 suites:
 - "wheezy"
 architectures:
-- "i386"
+- "amd64"
 packages:
 - "unzip"
 - "automake"
+- "faketime"
 - "zip"
 reference_datetime: "2000-01-01 00:00:00"
 remotes:
 - "url": "https://git.torproject.org/tor.git;
   "dir": "tor"
 files:
-- "versions"
+- "clang-linux64-wheezy-utils.zip"
+- "cctools.tar.gz"
 - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb"
-- 
"multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz"
+- "versions"
 - "dzip.sh"
 - "openssl-mac64-utils.zip"
 - "libevent-mac64-utils.zip"
@@ -33,35 +35,47 @@ script: |
   fi
   export TZ=UTC
   export LC_ALL=C
-  export REFERENCE_DATETIME
+  export FAKETIME=$REFERENCE_DATETIME
   umask 0022
   #
   mkdir -p $INSTDIR/bin/
   mkdir -p $TORBINDIR/
   mkdir -p $TORCONFIGDIR/
   mkdir -p $OUTDIR/
-  #
-  # dpkg requires sbin directories in the PATH
-  export PATH="/usr/sbin:/sbin:$PATH"
-  sudo dpkg -i *.deb
-  tar xaf multiarch-darwin*tar.xz
-  export PATH="$PATH:$HOME/build/apple-osx/bin/"
+
+  # Extracting and copying all the necessary utilities and libraries. We still
+  # need the 10.6 SDK if we want to support OSX 10.6.
+  ar x apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
+  tar xaf data.tar.gz
+  tar xaf cctools.tar.gz
+  unzip clang-linux64-wheezy-utils.zip
   unzip -d $INSTDIR openssl-mac64-utils.zip
   unzip -d $INSTDIR libevent-mac64-utils.zip
   cp $INSTDIR/libevent/lib/libevent-*.dylib $TORBINDIR/
   LIBEVENT_FILE=`basename $INSTDIR/libevent/lib/libevent-*.dylib`
 
+  # Setting the proper flags and variables
+  # ld needs libLTO.so from llvm
+  export LD_LIBRARY_PATH="/home/debian/build/clang/lib"
+  export PATH="/home/debian/build/cctools/bin:$PATH"
+  CROSS_CCTOOLS_PATH="/home/debian/build/cctools"
+  CROSS_SYSROOT="/home/debian/build/usr/lib/apple/SDKs/MacOSX10.6.sdk"
+  FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B 
$CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT"
+  export CC="/home/debian/build/clang/bin/clang $FLAGS"
+  export CXX="/home/debian/build/clang/bin/clang++ $FLAGS"
+  export CPP="/home/debian/build/clang/bin/clang $FLAGS -E"
+  export LLVMCONFIG="/home/debian/build/clang/bin/llvm-config"
+  export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"
+
   # Building tor
-  # XXX Clean up these flags?
-  export CFLAGS="-m64 -I${INSTDIR}/openssl/include 
-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ 
-I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I.  
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5"
-  export LDFLAGS="-m64 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ 
-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5"
   cd tor
   git update-index --refresh -q
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src
   ./autogen.sh
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
-  ./configure --enable-static-openssl --disable-asciidoc 
--host=i686-apple-darwin11 --with-libevent-dir=$INSTDIR/libevent 
--with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR
+  ./configure --enable-static-openssl --disable-asciidoc 
--host=x86_64-apple-darwin10 --with-libevent-dir=$INSTDIR/libevent 
--with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR
+  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
   make $MAKEOPTS
   make install
   cd $INSTDIR
@@ -69,7 +83,7 @@ script: |
   cp share/tor/geoip $TORCONFIGDIR/
   cp share/tor/geoip6 $TORCONFIGDIR/
   cd $TORBINDIR/
-  i686-apple-darwin11-install_name_tool -change 
$INSTDIR/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor
+  x86_64-apple-darwin10-install_name_tool -change 
$INSTDIR/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor
 
   # Grabbing the result
   cd $INSTDIR

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits