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

[stem/master] Support for CIRC_MINOR events
by atagar＠torproject.org 03 Dec '12

03 Dec '12

commit 3ba521dfa2f2a6f023e7b92fa24bcfb910f1fe78 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 3 09:00:49 2012 -0800 Support for CIRC_MINOR events Implementation and testing for CIRC_MINOR events. Snagged test data by listening for events while bootstrapping. --- stem/__init__.py | 20 +++++++++++ stem/control.py | 1 + stem/response/events.py | 77 ++++++++++++++++++++++++++++++++++++++++++ test/unit/response/events.py | 25 +++++++++++++ 4 files changed, 123 insertions(+), 0 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index d7ec4f8..cddf033 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -87,6 +87,7 @@ Library for working with the tor process. **HS_SERVICE_REND** server side hidden service rendezvous circuit **TESTING** testing to see if we're reachable, so we can be used as a relay **CONTROLLER** circuit that was built by a controller + **MEASURE_TIMEOUT** unknown (https://trac.torproject.org/7626) ==================== =========== .. data:: CircClosureReason (enum) @@ -114,6 +115,18 @@ Library for working with the tor process. **MEASUREMENT_EXPIRED** same as **TIMEOUT** except that it was left open for measurement purposes ========================= =========== +.. data:: CircEvent (enum) + + Type of change reflected in a circuit by a CIRC_MINOR event. Tor may provide + event types not in this enum. + + ===================== =========== + CircEvent Description + ===================== =========== + **PURPOSE_CHANGED** circuit purpose or hidden service state has changed + **CANNIBALIZED** circuit connections are being reused for a different circuit + ===================== =========== + .. data:: HiddenServiceState (enum) State that a hidden service circuit can have. These were introduced in tor @@ -355,6 +368,7 @@ __all__ = [ "CircBuildFlag", "CircPurpose", "CircClosureReason", + "CircEvent", "HiddenServiceState", "StreamStatus", "StreamClosureReason", @@ -467,6 +481,7 @@ CircPurpose = stem.util.enum.UppercaseEnum( "HS_SERVICE_REND", "TESTING", "CONTROLLER", + "MEASURE_TIMEOUT", ) CircClosureReason = stem.util.enum.UppercaseEnum( @@ -487,6 +502,11 @@ CircClosureReason = stem.util.enum.UppercaseEnum( "MEASUREMENT_EXPIRED", ) +CircEvent = stem.util.enum.UppercaseEnum( + "PURPOSE_CHANGED", + "CANNIBALIZED", +) + HiddenServiceState = stem.util.enum.UppercaseEnum( "HSCI_CONNECTING", "HSCI_INTRO_SENT", diff --git a/stem/control.py b/stem/control.py index 43229b5..c20db12 100644 --- a/stem/control.py +++ b/stem/control.py @@ -83,6 +83,7 @@ providing its own for interacting at a higher level. **BUILDTIMEOUT_SET** :class:`stem.response.events.BuildTimeoutSetEvent` **BW** :class:`stem.response.events.BandwidthEvent` **CIRC** :class:`stem.response.events.CircuitEvent` + **CIRC_MINOR** :class:`stem.response.events.CircMinorEvent` **CLIENTS_SEEN** :class:`stem.response.events.ClientsSeenEvent` **CONF_CHANGED** :class:`stem.response.events.ConfChangedEvent` **DEBUG** :class:`stem.response.events.LogEvent` diff --git a/stem/response/events.py b/stem/response/events.py index bf74fce..1763913 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -367,6 +367,82 @@ class CircuitEvent(Event): log_id = "event.circ.unknown_remote_reason.%s" % self.remote_reason log.log_once(log_id, log.INFO, unrecognized_msg % ('remote reason', self.remote_reason)) +class CircMinorEvent(Event): + """ + Event providing information about minor changes in our circuits. This was + first added in tor version 0.2.3.11. + + :var str id: circuit identifier + :var stem.CircEvent event: type of change in the circuit + :var tuple path: relays involved in the circuit, these are + **(fingerprint, nickname)** tuples + :var tuple build_flags: :data:`~stem.CircBuildFlag` attributes + governing how the circuit is built + :var stem.CircPurpose purpose: purpose that the circuit is intended for + :var stem.HiddenServiceState hs_state: status if this is a hidden service circuit + :var str rend_query: circuit's rendezvous-point if this is hidden service related + :var datetime created: time when the circuit was created or cannibalized + :var stem.CircPurpose old_purpose: prior purpose for the circuit + :var stem.HiddenServiceState old_hs_state: prior status as a hidden service circuit + """ + + _POSITIONAL_ARGS = ("id", "event", "path") + _KEYWORD_ARGS = { + "BUILD_FLAGS": "build_flags", + "PURPOSE": "purpose", + "HS_STATE": "hs_state", + "REND_QUERY": "rend_query", + "TIME_CREATED": "created", + "OLD_PURPOSE": "old_purpose", + "OLD_HS_STATE": "old_hs_state", + } + + def _parse(self): + self.path = tuple(stem.control._parse_circ_path(self.path)) + + if self.build_flags != None: + self.build_flags = tuple(self.build_flags.split(',')) + + if self.created != None: + try: + self.created = str_tools.parse_iso_timestamp(self.created) + except ValueError, exc: + raise stem.ProtocolError("Unable to parse create date (%s): %s" % (exc, self)) + + if self.id != None and not tor_tools.is_valid_circuit_id(self.id): + raise stem.ProtocolError("Circuit IDs must be one to sixteen alphanumeric characters, got '%s': %s" % (self.id, self)) + + # log if we have an unrecognized event, status, build flag, purpose, or + # hidden service state + + unrecognized_msg = UNRECOGNIZED_ATTR_MSG % ("CIRC_MINOR", self) + + if not self.event in stem.CircEvent: + log_id = "event.circ_minor.unknown_event.%s" % self.event + log.log_once(log_id, log.INFO, unrecognized_msg % ('event', self.event)) + + if self.build_flags: + for flag in self.build_flags: + if not flag in stem.CircBuildFlag: + log_id = "event.circ_minor.unknown_build_flag.%s" % flag + log.log_once(log_id, log.INFO, unrecognized_msg % ('build flag', flag)) + + if self.purpose and (not self.purpose in stem.CircPurpose): + log_id = "event.circ_minor.unknown_purpose.%s" % self.purpose + log.log_once(log_id, log.INFO, unrecognized_msg % ('purpose', self.purpose)) + + if self.hs_state and (not self.hs_state in stem.HiddenServiceState): + log_id = "event.circ_minor.unknown_hs_state.%s" % self.hs_state + log.log_once(log_id, log.INFO, unrecognized_msg % ('hidden service state', self.hs_state)) + + if self.old_purpose and (not self.old_purpose in stem.CircPurpose): + log_id = "event.circ_minor.unknown_purpose.%s" % self.old_purpose + log.log_once(log_id, log.INFO, unrecognized_msg % ('purpose', self.old_purpose)) + + if self.old_hs_state and (not self.old_hs_state in stem.HiddenServiceState): + log_id = "event.circ_minor.unknown_hs_state.%s" % self.old_hs_state + log.log_once(log_id, log.INFO, unrecognized_msg % ('hidden service state', self.hs_state)) + class ClientsSeenEvent(Event): """ Periodic event on bridge relays that provides a summary of our users. @@ -784,6 +860,7 @@ EVENT_TYPE_TO_CLASS = { "BUILDTIMEOUT_SET": BuildTimeoutSetEvent, "BW": BandwidthEvent, "CIRC": CircuitEvent, + "CIRC_MINOR": CircMinorEvent, "CLIENTS_SEEN": ClientsSeenEvent, "CONF_CHANGED": ConfChangedEvent, "DEBUG": LogEvent, diff --git a/test/unit/response/events.py b/test/unit/response/events.py index f6a4b85..a977627 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -53,6 +53,15 @@ $E57A476CD4DFBD99B4EE52A100A58610AD6E80B9,hamburgerphone" CIRC_BUILT_OLD = "650 CIRC 1 BUILT \ $E57A476CD4DFBD99B4EE52A100A58610AD6E80B9,hamburgerphone,PrivacyRepublic14" +# CIRC_MINOR event from tor 0.2.3.16. + +CIRC_MINOR_EVENT = "650 CIRC_MINOR 7 PURPOSE_CHANGED \ +$67B2BDA4264D8A189D9270E28B1D30A262838243~europa1 \ +BUILD_FLAGS=IS_INTERNAL,NEED_CAPACITY \ +PURPOSE=MEASURE_TIMEOUT \ +TIME_CREATED=2012-12-03T16:45:33.409602 \ +OLD_PURPOSE=TESTING" + # CLIENTS_SEEN example from the spec CLIENTS_SEEN_EVENT = '650 CLIENTS_SEEN \ @@ -406,6 +415,22 @@ class TestEvents(unittest.TestCase): self.assertEqual({'us': 16, 'de': 8, 'uk': 8}, event.locales) self.assertEqual({'v4': 16, 'v6': 40}, event.ip_versions) + def test_circ_minor_event(self): + event = _get_event(CIRC_MINOR_EVENT) + + self.assertTrue(isinstance(event, stem.response.events.CircMinorEvent)) + self.assertEqual(CIRC_MINOR_EVENT.lstrip("650 "), str(event)) + self.assertEqual("7", event.id) + self.assertEqual(CircEvent.PURPOSE_CHANGED, event.event) + self.assertEqual((("67B2BDA4264D8A189D9270E28B1D30A262838243", "europa1"),), event.path) + self.assertEqual((CircBuildFlag.IS_INTERNAL, CircBuildFlag.NEED_CAPACITY), event.build_flags) + self.assertEqual(CircPurpose.MEASURE_TIMEOUT, event.purpose) + self.assertEqual(None, event.hs_state) + self.assertEqual(None, event.rend_query) + self.assertEqual(datetime.datetime(2012, 12, 3, 16, 45, 33, 409602), event.created) + self.assertEqual(CircPurpose.TESTING, event.old_purpose) + self.assertEqual(None, event.old_hs_state) + def test_conf_changed(self): event = _get_event(CONF_CHANGED_EVENT)

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 03 Dec '12

03 Dec '12

commit 56c7439720c5de0f43267eb69b2848afbed2f4c2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 3 16:46:38 2012 +0000 Update translations for tails-persistence-setup --- lv/lv.po | 78 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lv/lv.po b/lv/lv.po index f66f927..781bdb0 100644 --- a/lv/lv.po +++ b/lv/lv.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2012-12-03 16:15+0000\n" +"PO-Revision-Date: 2012-12-03 16:45+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "GnuPG atslēgu turētāji un konfigurācija" +msgstr "GnuPG atslēgu turētāji un konfigurēšana" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" @@ -44,11 +44,11 @@ msgstr "SSH atslēgas, konfigurācija un zināmi resursdatori" #: ../lib/Tails/Persistence/Configuration/Presets.pm:78 msgid "Pidgin" -msgstr "Pidžins" +msgstr "Pidžinvaloda" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" -msgstr "Pidžinu profili un OTR atslēgu turētājs" +msgstr "Pidžinvalodu profili un OTR atslēgu turētājs" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Claws Mail" @@ -124,7 +124,7 @@ msgstr "Iestatīt Tails pastāvīgo sējumu" #: ../lib/Tails/Persistence/Setup.pm:442 #, perl-format msgid "Device %s already has a persistent volume." -msgstr "Ierīcei %s jau ir pastāvīgais sējums." +msgstr "Ierīcei %s jau ir pastāvīgā sējuma." #: ../lib/Tails/Persistence/Setup.pm:450 #, perl-format @@ -144,24 +144,24 @@ msgstr "Lietošanas laikā nav iespējams dzēst pastāvīgo sējumu. Lai to izd #: ../lib/Tails/Persistence/Setup.pm:483 msgid "Persistence volume is not unlocked." -msgstr "Nav atbloķēts pastāvības sējums." +msgstr "Nav atbloķēts pastāvīgais sējums." #: ../lib/Tails/Persistence/Setup.pm:488 msgid "Persistence volume is not mounted." -msgstr "Nav uzmontēts pastāvības sējums." +msgstr "Nav uzmontēts pastāvīgais sējums." #: ../lib/Tails/Persistence/Setup.pm:493 msgid "Persistence volume is not readable. Permissions or ownership problems?" -msgstr "Pastāvības sējums nav lasāms. Varbūt pastāv ar atļaujām vai īpašumtiesībām saistītas problēmas?" +msgstr "Pastāvīgais sējums nav lasāms. Varbūt pastāv ar atļaujām vai īpašumtiesībām saistītas problēmas?" #: ../lib/Tails/Persistence/Setup.pm:498 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" -msgstr "Nav iespējams ierakstīt pastāvības sējumā. Varbūt tas uzmontēts kā tikai lasāms?" +msgstr "Nav iespējams ierakstīt pastāvīgajā sējumā. Varbūt tas uzmontēts kā tikai lasāms?" #: ../lib/Tails/Persistence/Setup.pm:507 #, perl-format msgid "Tails is running from non-USB device %s." -msgstr "Tails strādā no ierīces, kura nav USB, %s." +msgstr "Tails strādā no ne-USB ierīces %s." #: ../lib/Tails/Persistence/Setup.pm:513 #, perl-format @@ -171,30 +171,30 @@ msgstr "Ierīce %s ir optiska." #: ../lib/Tails/Persistence/Setup.pm:520 #, perl-format msgid "Device %s was not created using Tails USB installer." -msgstr "" +msgstr "Ierīce %s nav izveidota izmantojot Tails USB instalēšanas programmu." #: ../lib/Tails/Persistence/Setup.pm:554 msgid "Error" -msgstr "" +msgstr "Kļūda" #: ../lib/Tails/Persistence/Setup.pm:861 msgid "Persistence wizard - Finished" -msgstr "" +msgstr "Pastāvīguma vednis - pabeigts" #: ../lib/Tails/Persistence/Setup.pm:864 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "" +msgstr "Jebkādas veiktās izmaiņas stāsies spēkā tikai pēc Tails pārstartēšanas.\n\nTagad variet aizvērt šo lietotni." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation" -msgstr "" +msgstr "Pastāvīguma vednis - pastāvīgā sējuma veidošana" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 msgid "Choose a passphrase to protect the persistent volume" -msgstr "" +msgstr "Izvēlēties ieejas frāzi pastāvīgā sējuma aizsardzībai" #. TRANSLATORS: size, device vendor, device model #: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 @@ -206,7 +206,7 @@ msgstr "" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" -msgstr "" +msgstr "Izveidot" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 msgid "" @@ -214,63 +214,63 @@ msgid "" "understood. Tails can't help you if you use it wrong! See <a " "href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" " documentation about persistence</a> to learn more." -msgstr "" +msgstr "Uzmanību! Pastāvības izmantošanai ir sekas, kuras labi jāizprot. Tails nespēs palīdzēt, ja to izmanto nepareizi! Lūdzu skatīt <a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails dokumentācija par pastāvību</a> , lai uzzinātu vairāk informācijas." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "" +msgstr "Ieejas frāze:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:" -msgstr "" +msgstr "Verificēt ieejas frāzi:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 msgid "Passphrase can't be empty" -msgstr "" +msgstr "Ieejas frāze nedrīkst būt tukša" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 msgid "Passphrases do not match" -msgstr "" +msgstr "Ieejas frāzes nesakrīt" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 #: ../lib/Tails/Persistence/Step/Configure.pm:189 msgid "Failed" -msgstr "" +msgstr "Neizdevās" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 #: ../lib/Tails/Persistence/Step/Delete.pm:84 msgid "Correcting attributes on Tails system partition." -msgstr "" +msgstr "Labo atribūtus Tails sistēmas nodalījumā" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 #: ../lib/Tails/Persistence/Step/Delete.pm:87 msgid "The attributes of the Tails system partition will be corrected." -msgstr "" +msgstr "Tiks laboti Tails sistēmas nodalījuma atribūti." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 msgid "Mounting Tails persistence partition." -msgstr "" +msgstr "Montē Tails pastāvīgo nodalījumu. " #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "The Tails persistence partition will be mounted." -msgstr "" +msgstr "Tiks montēts Tails pastāvīgais nodalījums." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 msgid "Creating..." -msgstr "" +msgstr "Izveido..." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 msgid "Creating the persistent volume..." -msgstr "" +msgstr "Izveido pastāvīgo sējumu..." #: ../lib/Tails/Persistence/Step/Configure.pm:60 msgid "Persistence wizard - Persistent volume configuration" -msgstr "" +msgstr "Pastāvīguma vednis - pastāvīgā sējuma kofigurēšana" #: ../lib/Tails/Persistence/Step/Configure.pm:63 msgid "Specify the files that will be saved in the persistent volume" -msgstr "" +msgstr "Norādiet pastāvīgajā sējumā noglabājamās datnes" #. TRANSLATORS: partition, size, device vendor, device model #: ../lib/Tails/Persistence/Step/Configure.pm:67 @@ -278,35 +278,35 @@ msgstr "" msgid "" "The selected files will be stored in the encrypted partition %s (%s), on the" " %s %s device." -msgstr "" +msgstr "Izvēlētās datnes tiks saglabātas šifrētajā nodalījumā %s (%s), uz ierīces %s %s." #: ../lib/Tails/Persistence/Step/Configure.pm:73 msgid "Save" -msgstr "" +msgstr "Saglabāt" #: ../lib/Tails/Persistence/Step/Configure.pm:135 msgid "Make custom directory persistent (absolute path):" -msgstr "" +msgstr "Padarīt pielāgotu direktoriju par pastāvīgu (absolūts ceļš): " #: ../lib/Tails/Persistence/Step/Configure.pm:141 msgid "Destination:" -msgstr "" +msgstr "Mērķis:" #: ../lib/Tails/Persistence/Step/Configure.pm:204 msgid "Saving..." -msgstr "" +msgstr "Saglabā..." #: ../lib/Tails/Persistence/Step/Configure.pm:207 msgid "Saving persistence configuration..." -msgstr "" +msgstr "Saglabā pastāvīguma konfigurāciju..." #: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" -msgstr "" +msgstr "Pastāvīguma vednis - pastāvīgā sējuma dzēšana" #: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." -msgstr "" +msgstr "Jūsu pastāvīgie dati tiks dzēsti" #: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format

1 0

[torbrowser/maint-2.3] add libssp to the windows bundles
by erinn＠torproject.org 03 Dec '12

03 Dec '12

commit 7fc2ee548c5a15bad91cc3a3d0b6f8ae6ef10029 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 3 16:28:25 2012 +0000 add libssp to the windows bundles --- build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 0492f84..d3efa35 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -247,6 +247,7 @@ directory-structure: ## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> install-binaries: cp $(MING)/mingwm10.dll $(APPDIR) + cp $(MING)/libssp-0.dll $(APPDIR) cp $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR)

1 0

[torbrowser/maint-2.4] add libssp to the windows bundles
by erinn＠torproject.org 03 Dec '12

03 Dec '12

commit 7fc2ee548c5a15bad91cc3a3d0b6f8ae6ef10029 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 3 16:28:25 2012 +0000 add libssp to the windows bundles --- build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 0492f84..d3efa35 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -247,6 +247,7 @@ directory-structure: ## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> install-binaries: cp $(MING)/mingwm10.dll $(APPDIR) + cp $(MING)/libssp-0.dll $(APPDIR) cp $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR)

1 0

[torbrowser/maint-2.4] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 03 Dec '12

03 Dec '12

commit 96b72fe20189d924e5439527d1cceec263b3dfd1 Merge: 60acc4d 7fc2ee5 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 3 16:28:51 2012 +0000 Merge branch 'maint-2.3' into maint-2.4 build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] add libssp to the windows bundles
by erinn＠torproject.org 03 Dec '12

03 Dec '12

commit 7fc2ee548c5a15bad91cc3a3d0b6f8ae6ef10029 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 3 16:28:25 2012 +0000 add libssp to the windows bundles --- build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 0492f84..d3efa35 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -247,6 +247,7 @@ directory-structure: ## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> install-binaries: cp $(MING)/mingwm10.dll $(APPDIR) + cp $(MING)/libssp-0.dll $(APPDIR) cp $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR)

1 0

[torbrowser/maint-2.4] add libssp to the windows bundles
by erinn＠torproject.org 03 Dec '12

03 Dec '12

commit 5d8a02fc79630f08963004719c79220038a96bce Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 3 16:29:13 2012 +0000 add libssp to the windows bundles --- build-scripts/windows-alpha.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 7f4ba1d..c9837a3 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -267,6 +267,7 @@ directory-structure: ## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> install-binaries: cp $(MING)/mingwm10.dll $(APPDIR) + cp $(MING)/libssp-0.dll $(APPDIR) cp $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR)

1 0

[torbrowser/master] Merge branch 'maint-2.3' into maint-2.4
by erinn＠torproject.org 03 Dec '12

03 Dec '12

commit 96b72fe20189d924e5439527d1cceec263b3dfd1 Merge: 60acc4d 7fc2ee5 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 3 16:28:51 2012 +0000 Merge branch 'maint-2.3' into maint-2.4 build-scripts/windows.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[torbrowser/master] add libssp to the windows bundles
by erinn＠torproject.org 03 Dec '12

03 Dec '12

commit 5d8a02fc79630f08963004719c79220038a96bce Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 3 16:29:13 2012 +0000 add libssp to the windows bundles --- build-scripts/windows-alpha.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 7f4ba1d..c9837a3 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -267,6 +267,7 @@ directory-structure: ## Filenames extracted using Dependency Walker <http://www.dependencywalker.com/> install-binaries: cp $(MING)/mingwm10.dll $(APPDIR) + cp $(MING)/libssp-0.dll $(APPDIR) cp $(QT_LIB)/QtCore4.dll $(QT_LIB)/QtGui4.dll $(QT_LIB)/QtNetwork4.dll $(QT_LIB)/QtXml4.dll $(QT_LIB)/libgcc_s_dw2-1.dll $(APPDIR) cp $(OPENSSL_LIB)/ssleay32.dll $(APPDIR) cp $(OPENSSL_LIB)/libeay32.dll $(APPDIR)

1 0

[torbrowser/maint-2.4] use the right changelogs and READMEs in the alpha bundles
by erinn＠torproject.org 03 Dec '12

03 Dec '12

commit 1e8b4a38d59ca3e72d73973dbe8db540ec809788 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Dec 3 16:05:53 2012 +0000 use the right changelogs and READMEs in the alpha bundles --- build-scripts/linux-alpha.mk | 4 ++-- build-scripts/osx-alpha.mk | 4 ++-- build-scripts/windows-alpha.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index be48895..a08466b 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -292,9 +292,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.linux-2.3 $(DOCSDIR)/changelog + cp ../changelog.linux-2.4 $(DOCSDIR)/changelog # This should be updated to be more generic (version-wise) and more Linux specific - cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle + cp ../README.LINUX-2.4 $(DOCSDIR)/README-TorBrowserBundle ifeq ($(USE_OBFSPROXY),1) mkdir -p $(DOCSDIR)/Obfsproxy cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1c77620..3c1e050 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -308,9 +308,9 @@ install-docs: cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt - cp ../changelog.osx-2.3 $(DOCSDIR)/changelog + cp ../changelog.osx-2.4 $(DOCSDIR)/changelog cp ../LICENSE $(DEST) - cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle + cp ../README.OSX-2.4 $(DEST)/README-TorBrowserBundle ## Copy over Firefox install-firefox: diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 0505ab2..ead5b9b 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -293,8 +293,8 @@ install-docs: cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW - cp ../changelog.windows-2.3 $(DOCSDIR)/changelog - cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle + cp ../changelog.windows-2.4 $(DOCSDIR)/changelog + cp ../README.WIN-2.4 $(DOCSDIR)/README-TorBrowserBundle ifeq ($(USE_OBFSPROXY),1) mkdir -p $(DOCSDIR)/Obfsproxy cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy

1 0