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

[stem/master] Updating gitweb urls
by atagar＠torproject.org 06 Dec '14

06 Dec '14

commit f6122a12f2de36116419e9953065ea8aaa983491 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 5 13:12:40 2014 -0800 Updating gitweb urls Our new version of gitweb use a different scheme for its urls. --- docs/conf.py | 4 ++-- docs/faq.rst | 4 ++-- docs/index.rst | 2 +- docs/roles.py | 4 ++-- docs/tutorials.rst | 2 +- docs/tutorials/double_double_toil_and_trouble.rst | 2 +- docs/tutorials/down_the_rabbit_hole.rst | 4 ++-- stem/__init__.py | 2 +- stem/descriptor/extrainfo_descriptor.py | 4 ++-- stem/descriptor/microdescriptor.py | 2 +- stem/descriptor/remote.py | 8 ++++---- stem/descriptor/server_descriptor.py | 2 +- stem/exit_policy.py | 4 ++-- stem/response/events.py | 2 +- stem/version.py | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 756bd20..e778923 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -229,5 +229,5 @@ man_pages = [ ['%s (%s)' % (__author__, __contact__)], 1) ] -trac_url = 'https://trac.torproject.org' -spec_url = 'https://gitweb.torproject.org/torspec.git/commitdiff' +trac_url = 'https://trac.torproject.org/{slug}' +spec_url = 'https://gitweb.torproject.org/torspec.git/commit/?id={slug}' diff --git a/docs/faq.rst b/docs/faq.rst index b235961..d622f42 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -36,7 +36,7 @@ What is Stem? Stem is a Python controller library that you can use to interact with `Tor <https://www.torproject.org/>`_. With it you can write scripts and applications with capabilities similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. -From a technical standpoint, Stem is a Python implementation of Tor's `directory <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_ and `control specifications <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_. `To get started see our tutorials! <tutorials.html>`_ +From a technical standpoint, Stem is a Python implementation of Tor's `directory <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_ and `control specifications <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_. `To get started see our tutorials! <tutorials.html>`_ .. _does_stem_have_any_dependencies: @@ -65,7 +65,7 @@ Can I interact with Tor's controller interface directly? -------------------------------------------------------- Yup. You don't need a library to interact with Tor's `controller interface -<https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_, and +<https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_, and interacting with it directly is a great way to learn about what it can do. The exact details for how you connect to Tor depend on two things... diff --git a/docs/index.rst b/docs/index.rst index 022a74d..78920bc 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ Welcome to Stem! ================ -Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://gitweb.torproject.org/pytorctl.git>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.2** (released June 7th, 2014). +Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://gitweb.torproject.org/pytorctl.git>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.2** (released June 7th, 2014). .. Main Stem Logo Source: http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html diff --git a/docs/roles.py b/docs/roles.py index 67e944c..27b4d4a 100644 --- a/docs/roles.py +++ b/docs/roles.py @@ -41,7 +41,7 @@ def role_trac(name, rawtext, text, lineno, inliner, options={}, content=[]): def role_spec(name, rawtext, text, lineno, inliner, options={}, content=[]): """ - Aliases :spec:`25b0d43` to 'https://gitweb.torproject.org/torspec.git/commitdiff/25b0d43'. + Aliases :spec:`25b0d43` to 'https://gitweb.torproject.org/torspec.git/commit/?id=25b0d43'. """ # checking if the input is a valid short commit id @@ -77,7 +77,7 @@ def make_link_node(rawtext, app, url_type, link_text, slug, options): if not base_url: raise ValueError("'%s' isn't set in our config" % url_type) - ref = base_url.rstrip('/') + '/' + slug + ref = base_url.format(slug = slug) set_classes(options) return reference(rawtext, link_text, refuri = ref, **options) diff --git a/docs/tutorials.rst b/docs/tutorials.rst index 40b5439..271ccea 100644 --- a/docs/tutorials.rst +++ b/docs/tutorials.rst @@ -107,7 +107,7 @@ feet wet by jumping straight in with some tutorials... Interactive interpreter for Tor that provides you with direct access to Tor's `control interface - <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_ + <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ via either python or direct requests. This is an easy way of experimenting with Stem and learning what Tor can do. diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index ce6c58a..e131d0c 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -60,7 +60,7 @@ Applications `BeagleBone for Secret Agents <https://github.com/jbdatko/beagle-bone-for-secret-agents>`_ Bridge with a `bandwidth monitor <https://github.com/jbdatko/beagle-bone-for-secret-agents/blob/master/ch2/be…>`_ on a BeagleBoard. `RTT Prober <https://bitbucket.org/ra_/tor-rtt/>`_ Measures round-trip times for Tor circuits. `TorPS <https://www.torproject.org/getinvolved/volunteer.html.en#project-torps>`_ Tor path simulator. -`Metrics Tasks <https://gitweb.torproject.org/metrics-tasks.git/tree>`_ One-off tasks related to Tor metrics. These mostly involve using descriptor information to answer a particular question. Tasks that involve Stem are: `1854 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-1854/pylinf…>`_, `6232 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-6232/pyentr…>`_, and `7241 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-7241/first_…>`_. +`Metrics Tasks <https://gitweb.torproject.org/metrics-tasks.git/tree>`_ One-off tasks related to Tor metrics. These mostly involve using descriptor information to answer a particular question. Tasks that involve Stem are: `1854 <https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-1854/pylinf…>`_, `6232 <https://gitweb.torproject.org/metrics-tasks.git/tree/task-6232/pyentropy.py>`_, and `7241 <https://gitweb.torproject.org/metrics-tasks.git/tree/task-7241/first_pass.py>`_. `check_tor <http://anonscm.debian.org/gitweb/?p=users/lunar/check_tor.git;a=blob;f=chec…>`_ Nagios check to verify that a relay is participating in the Tor network. `munin-tor <https://github.com/mweinelt/munin-tor>`_ Plugin to provide Munin graphs. `tbbscraper <https://github.com/zackw/tbbscraper/blob/master/controller/controller.py>`_ Automated website scraper over Tor. diff --git a/docs/tutorials/down_the_rabbit_hole.rst b/docs/tutorials/down_the_rabbit_hole.rst index 21569d0..709f596 100644 --- a/docs/tutorials/down_the_rabbit_hole.rst +++ b/docs/tutorials/down_the_rabbit_hole.rst @@ -2,9 +2,9 @@ Down the Rabbit Hole ==================== Underneath it all Stem is a Python implementation of Tor's `control -<https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_ and +<https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_ and `directory specifications -<https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_. +<https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_. Anything you can do with Stem you can also do `with telnet <../faq.html#can-i-interact-with-tors-controller-interface-directly>`_ (albeit with quite a bit of extra work). diff --git a/stem/__init__.py b/stem/__init__.py index c034f4f..640cdff 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -55,7 +55,7 @@ Library for working with the tor process. Flag assigned to tor relays by the authorities to indicate various characteristics. - **Note:** The BADDIRECTORY flag was `removed from tor <https://gitweb.torproject.org/torspec.git/commitdiff/2f012f1>`_. + **Note:** The BADDIRECTORY flag was `removed from tor <https://gitweb.torproject.org/torspec.git/commit/dir-spec.txt?id=2f012f1>`_. ================= =========== Flag Description diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index b677888..b260888 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -8,7 +8,7 @@ server descriptors these don't contain information that Tor clients require to function and as such aren't fetched by default. Defined in section 2.2 of the `dir-spec -<https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_, +<https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_, extra-info descriptors contain interesting but non-vital information such as usage statistics. Tor clients cannot request these documents for bridges. @@ -861,7 +861,7 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): """ Relay extra-info descriptor, constructed from data such as that provided by 'GETINFO extra-info/digest/\*', cached descriptors, and metrics - (`specification <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_). + (`specification <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_). :var str signature: **\*** signature for this extrainfo descriptor diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index addb495..c3d3db9 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -154,7 +154,7 @@ def _parse_file(descriptor_file, validate = True, **kwargs): class Microdescriptor(Descriptor): """ Microdescriptor (`descriptor specification - <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_) + <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_) :var str digest: **\*** hex digest for this microdescriptor, this can be used to match against the corresponding digest attribute of a diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 0e912aa..d70c059 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -158,7 +158,7 @@ class Query(object): Tor provides quite a few different descriptor resources via its directory protocol (see section 4.2 and later of the `dir-spec - <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_). + <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_). Commonly useful ones include... ===================================== =========== @@ -520,7 +520,7 @@ class DescriptorDownloader(object): :param str authority_v3ident: fingerprint of the authority key for which to get the consensus, see `'v3ident' in tor's config.c - <https://gitweb.torproject.org/tor.git/blob/f631b73:/src/or/config.c#l816>`_ + <https://gitweb.torproject.org/tor.git/tree/src/or/config.c#n819>`_ for the values. :param query_args: additional arguments for the :class:`~stem.descriptor.remote.Query` constructor @@ -563,7 +563,7 @@ class DescriptorDownloader(object): :param str authority_v3idents: fingerprint or list of fingerprints of the authority keys, see `'v3ident' in tor's config.c - <https://gitweb.torproject.org/tor.git/blob/f631b73:/src/or/config.c#l816>`_ + <https://gitweb.torproject.org/tor.git/tree/src/or/config.c#n819>`_ for the values. :param query_args: additional arguments for the :class:`~stem.descriptor.remote.Query` constructor @@ -620,7 +620,7 @@ class DescriptorDownloader(object): class DirectoryAuthority(object): """ Tor directory authority, a special type of relay `hardcoded into tor - <https://gitweb.torproject.org/tor.git/blob/f631b73:/src/or/config.c#l816>`_ + <https://gitweb.torproject.org/tor.git/tree/src/or/config.c#n819>`_ that enumerates the other relays within the network. At a very high level tor works as follows... diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index e92f0e0..40c6a27 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -649,7 +649,7 @@ class ServerDescriptor(Descriptor): class RelayDescriptor(ServerDescriptor): """ Server descriptor (`descriptor specification - <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_) + <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_) :var str onion_key: **\*** key used to encrypt EXTEND cells :var str ntor_onion_key: base64 key used to encrypt EXTEND in the ntor protocol diff --git a/stem/exit_policy.py b/stem/exit_policy.py index 9adb699..0b7bea7 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -534,7 +534,7 @@ class MicroExitPolicy(ExitPolicy): Since these policies are a subset of the exit policy information (lacking IP ranges) clients can only use them to guess if a relay will accept traffic or - not. To quote the `dir-spec <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_ (section 3.2.1)... + not. To quote the `dir-spec <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_ (section 3.2.1)... :: @@ -611,7 +611,7 @@ class ExitPolicyRule(object): traffic to exit. The format of these rules are formally described in the `dir-spec - <https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt>`_ as an + <https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt>`_ as an 'exitpattern'. Note that while these are similar to tor's man page entry for ExitPolicies, it's not the exact same. An exitpattern is better defined and stricter in what it'll accept. For instance, ports are not optional and it diff --git a/stem/response/events.py b/stem/response/events.py index 92dd281..49a0779 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -26,7 +26,7 @@ class Event(stem.response.ControlMessage): """ Base for events we receive asynchronously, as described in section 4.1 of the `control-spec - <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_. + <https://gitweb.torproject.org/torspec.git/tree/control-spec.txt>`_. :var str type: event type :var int arrived_at: unix timestamp for when the message arrived diff --git a/stem/version.py b/stem/version.py index be971fb..531c363 100644 --- a/stem/version.py +++ b/stem/version.py @@ -136,7 +136,7 @@ class Version(object): """ Comparable tor version. These are constructed from strings that conform to the 'new' style in the `tor version-spec - <https://gitweb.torproject.org/torspec.git/blob/HEAD:/version-spec.txt>`_, + <https://gitweb.torproject.org/torspec.git/tree/version-spec.txt>`_, such as "0.1.4" or "0.2.2.23-alpha (git-7dcd105be34a4f44)". :var int major: major version

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 05 Dec '14

05 Dec '14

commit 6f5e3e8ce8b0d72c6135b05cbf17cf863c8a6e3a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 5 17:45:38 2014 +0000 Update translations for tails-misc_completed --- ar.po | 222 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 115 insertions(+), 107 deletions(-) diff --git a/ar.po b/ar.po index 0699f0c..9fafde6 100644 --- a/ar.po +++ b/ar.po @@ -6,10 +6,12 @@ # skygazer <abudayeh.saleh(a)gmail.com>, 2014 # anchor <al3arbe1(a)gmail.com>, 2013 # Arwa, 2014 +# Ash <ali.shatrieh(a)gmail.com>, 2014 # 0xidz <ghoucine(a)gmail.com>, 2014 # Matt Santy <matt_santy(a)hotmail.com>, 2013 # Mohammed ALDOUB <voulnet(a)gmail.com>, 2013 # Osama H. Qasho' <osamah_owis(a)windowslive.com>, 2014 +# Osama M. Mneina <o.mneina(a)gmail.com>, 2014 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 # محيي الدين <tx99h4(a)hotmail.com>, 2014 # محيي الدين <tx99h4(a)hotmail.com>, 2014 @@ -17,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-08 19:08+0200\n" -"PO-Revision-Date: 2014-07-04 13:40+0000\n" -"Last-Translator: 0xidz <ghoucine(a)gmail.com>\n" +"POT-Creation-Date: 2014-12-02 11:29+0100\n" +"PO-Revision-Date: 2014-12-05 17:21+0000\n" +"Last-Translator: Osama M. Mneina <o.mneina(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,11 +29,11 @@ msgstr "" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42 msgid "Tor is ready" msgstr "تور جاهز" -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:44 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 msgid "You can now access the Internet." msgstr "يمكنك الأن تصفح الأنترنت." @@ -85,41 +87,41 @@ msgstr "إدارة المفاتيح" msgid "The clipboard does not contain valid input data." msgstr "ذاكرة النسخ المؤقتة لا تحتوي مدخلات سليمة." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:294 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:296 -#: config/chroot_local-includes/usr/local/bin/gpgApplet:298 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:295 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:297 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:299 msgid "Unknown Trust" msgstr "غير موثوق به" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:300 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:301 msgid "Marginal Trust" msgstr "ثقة جزئية" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:302 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:303 msgid "Full Trust" msgstr "ثقة كاملة" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:304 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:305 msgid "Ultimate Trust" msgstr "ثقة نهائية" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:357 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:358 msgid "Name" msgstr "الاسم" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:358 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:359 msgid "Key ID" msgstr "هوية المفتاح" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:359 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:360 msgid "Status" msgstr "الحالة" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:391 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:392 msgid "Fingerprint:" msgstr "بصمة المفتاح:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:394 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:395 msgid "User ID:" msgid_plural "User IDs:" msgstr[0] " " @@ -129,37 +131,37 @@ msgstr[3] "هويات المستخدمين:" msgstr[4] "هويات المستخدمين:" msgstr[5] "هويات المستخدمين:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:424 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:425 msgid "None (Don't sign)" msgstr "دون اختيار (لا توقع الكترونيا)" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:487 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:488 msgid "Select recipients:" msgstr "اختر المستلمين:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:495 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:496 msgid "Hide recipients" msgstr "إخفاء المستلمين" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:498 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:499 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." msgstr "اخفي هويات المستلمين لكل الرسائل المشفرة. اذا لم تقم بهذا فسيستطيع كل من يشاهد الرسائل المشفرة أن يعرف من أرسلت له." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:504 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:505 msgid "Sign message as:" msgstr "وقع الرسالة الكترونيا بصفة:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:508 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:509 msgid "Choose keys" msgstr "اختار المفاتيح" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:548 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:549 msgid "Do you trust these keys?" msgstr "هل تثق بهذه المفاتيح؟" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:551 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:552 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" msgstr[0] " " @@ -169,7 +171,7 @@ msgstr[3] "المفاتيح التالية غير موثوقة بالكامل:" msgstr[4] "المفاتيح التالية غير موثوقة بالكامل:" msgstr[5] "المفاتيح التالية غير موثوقة بالكامل:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:569 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:570 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" msgstr[0] " " @@ -179,61 +181,45 @@ msgstr[3] "هل تثق بهذه المفاتيح بالقدر الكافي لا msgstr[4] "هل تثق بهذه المفاتيح بالقدر الكافي لاستخدامها على أية حال؟" msgstr[5] "هل تثق بهذه المفاتيح بالقدر الكافي لاستخدامها على أية حال؟" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:582 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:583 msgid "No keys selected" msgstr "لا يوجد مفاتيح محددة" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:584 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:585 msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." msgstr "يجب عليك اختيار مفتاح تشفير خاص لتوقيع الرسالة الكترونيا، أو بعض المفاتيح العامة لتشفير الرسالة، أو كلاهما معاً:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:612 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:613 msgid "No keys available" msgstr "لا يوجد مفاتيح متاحة" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:614 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:615 msgid "" "You need a private key to sign messages or a public key to encrypt messages." msgstr "تحتاج لمفتاح تشفير خاص لتوقيع الرسائل الكترونياً، أو مفتاح تشفير عام لتشفير الرسائل." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:742 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:743 msgid "GnuPG error" msgstr "خطأ في GnuPG" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:763 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:764 msgid "Therefore the operation cannot be performed." msgstr "ولهذا لا يمكن اتمام العملية." -#: config/chroot_local-includes/usr/local/bin/gpgApplet:813 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:814 msgid "GnuPG results" msgstr "نتائج GnuPG" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:819 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:820 msgid "Output of GnuPG:" msgstr "مخرجات GnuPG:" -#: config/chroot_local-includes/usr/local/bin/gpgApplet:844 +#: config/chroot_local-includes/usr/local/bin/gpgApplet:845 msgid "Other messages provided by GnuPG:" msgstr "رسائل أخرى من GnuPG:" -#: config/chroot_local-includes/usr/local/bin/iceweasel:12 -msgid "Tor is not ready" -msgstr "تور غير جاهز" - -#: config/chroot_local-includes/usr/local/bin/iceweasel:13 -msgid "Tor is not ready. Start Tor Browser anyway?" -msgstr "تور غير جاهز. بدء متصفح تور على أي حال؟" - -#: config/chroot_local-includes/usr/local/bin/iceweasel:14 -msgid "Start Tor Browser" -msgstr "أبدأ متصفح تور" - -#: config/chroot_local-includes/usr/local/bin/iceweasel:15 -msgid "Cancel" -msgstr "إلغاء" - #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 msgid "Shutdown Immediately" msgstr "إيقاف التشغيل في الحال" @@ -338,38 +324,13 @@ msgid "" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." msgstr "فشلت عملية انتحال وحدة تحكم وصول الوسائط لبطاقة الشبكة ${nic_name} (${nic}). كما فشلت عملية إصلاح الأخطاء لذا فقد تم تعطيل كل عمليات الشبكة.\nربما تفضل إعادة تشغيل Tails وتعطيل انتحال وحدة تحكم وصول الوسائط. راجع<a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>الوثائق</a>." -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 -msgid "Starting I2P..." -msgstr "بدء تشغيل I2P...." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:63 -msgid "The I2P router console will be opened on start." -msgstr "سيتم فتح لوحة تحكم راوتر I2P عند بدء التشغيل." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:82 -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:124 -msgid "I2P failed to start" -msgstr "I2P فشل في بدء التشغيل" - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:83 -msgid "" -"Make sure that you have a working Internet connection, then try to start I2P" -" again." -msgstr "تأكد من وجود اشتراك انترنت فعال ثم حاول تشغيل I2P مرة أخرى." - -#: config/chroot_local-includes/usr/local/bin/tails-start-i2p:125 -msgid "" -"Something went wrong when I2P was starting. Look in the logs in the " -"following directory for more information:" -msgstr "حصل خطأ ما عند تشغيل I2P. راجع ملفات السجل بالمجلد التالي للمزيد من المعلومات:" - #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:61 msgid "error:" msgstr "خطأ:" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:62 msgid "Error" msgstr "خطأ" @@ -403,77 +364,120 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'> لمعرفة المزيد...</a>" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68 +#: config/chroot_local-includes/usr/local/bin/tor-browser:18 +msgid "Tor is not ready" +msgstr "تور غير جاهز" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:19 +msgid "Tor is not ready. Start Tor Browser anyway?" +msgstr "تور غير جاهز. بدء متصفح تور على أي حال؟" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:20 +msgid "Start Tor Browser" +msgstr "أبدأ متصفح تور" + +#: config/chroot_local-includes/usr/local/bin/tor-browser:21 +msgid "Cancel" +msgstr "إلغاء" + +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 msgid "Do you really want to launch the Unsafe Browser?" msgstr "هل حقاً تريد تشغيل المتصفح غير الآمن؟" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:74 msgid "" "Network activity within the Unsafe Browser is <b>not anonymous</b>. Only use" " the Unsafe Browser if necessary, for example if you have to login or " "register to activate your Internet connection." msgstr "نشاطاتك بالشبكة أثناء استخدام المتصفح غير الآمن تكون <b>غير مجهولة الهوية</b>. فقط استخدم المتصفح غير الآمن عند الضرورة، مثلاً اذا احتجت لتسجيل الدخول أو الاشتراك لتفعيل خدمة الانترنت." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:71 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:75 msgid "_Launch" msgstr "_Launch" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:76 msgid "_Exit" msgstr "_Exit" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:86 msgid "Starting the Unsafe Browser..." msgstr "جاري تشغيل المتصفح الغير آمن..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:87 msgid "This may take a while, so please be patient." msgstr "قد يستغرق هذا بعض الوقت، يرجى التحلي بالصبر." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:101 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:121 msgid "Failed to setup chroot." msgstr "فشلت محاولة تشغيل chroot." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:195 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "المتصفح الغير الآمن" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:251 msgid "Shutting down the Unsafe Browser..." msgstr "جاري إيقاف تشغيل المتصفح الغير الآمن..." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:252 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "هذه العملية قد تأخذ وقتاً طويلاً، وقد لا تتمكن من إعادة تشغيل المتصفح غير الآمن حتى يتم اغلاقه بشكل كامل." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:264 msgid "Failed to restart Tor." msgstr "فشلت محاولة إعادة تشغيل تور." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:272 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "توجد نسخة أخرى تعمل أو يتم تنظيفها من المتصفح غير الآمن. رجاءً حاول بعد قليل." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:285 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." msgstr "لم يتم الحصول على سيرفر DNS من خلال بروتوكول DHCP أو عن طريق الادخال اليدوي في NetworkManager." -#: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:11 -msgid "TrueCrypt will soon be removed from Tails" -msgstr "ستتم إزالة TrueCrypt من تيلز قريباً" +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:30 +msgid "I2P failed to start" +msgstr "I2P فشل في بدء التشغيل" -#: config/chroot_local-includes/usr/share/tails/truecrypt-wrapper.disabled:12 +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 msgid "" -"TrueCrypt will soon be removed from Tails due to license and development " -"concerns." -msgstr "ستتم إزالة TrueCrypt من تايلز قريباً بسبب الرخصة ومشاكل بالتطوير." +"Something went wrong when I2P was starting. Check the logs in /var/log/i2p " +"for more information." +msgstr "حدث خطأ ما خلال تشغيل I2P. افحص السجلات الموجودة في /var/log/i2p للمزيد من المعلومات." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:42 +msgid "I2P's router console is ready" +msgstr "إن طرفية موجِّه I2P جاهزة" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:43 +msgid "You can now access I2P's router console on http://127.0.0.1:7657." +msgstr "يمكنك الوصول إلى طرفية موِّجه I2P عبر http://127.0.0.1:7657" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:48 +msgid "I2P is not ready" +msgstr "I2P غير جاهز" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:49 +msgid "" +"Eepsite tunnel not built within six minutes. Check the router console at " +"http://127.0.0.1:7657/logs or the logs in /var/log/i2p for more information." +" Reconnect to the network to try again." +msgstr "ايبسايت Eepsite لم يُبنى خلال ستّة دقائق. للمزيد من المعلومات, الرجاء التحقق من نافذة الموجّه على http://127.0.0.1:7657/logs أو من خلال اللوائح في /var/log/i2p. الرجاء معاودة الاتصال بالشبكة للمحاولة مرة أخرى." + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:59 +msgid "I2P is ready" +msgstr "I2P جاهز" + +#: config/chroot_local-includes/usr/local/sbin/tails-i2p:60 +msgid "You can now access services on I2P." +msgstr "يمكن الوصول إلى الخدمات عبر I2P." #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" @@ -488,17 +492,13 @@ msgstr "وثائق تيلز" msgid "Learn how to use Tails" msgstr "تعلم كيف تستخدم Tails" -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 -msgid "Anonymous overlay network " -msgstr "شبكة غطاء مجهولة" +#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 +msgid "Anonymous overlay network browser" +msgstr "متصفح مخفي لشبكة طبقية " -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:2 -msgid "i2p" -msgstr "i2p" - -#: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:3 -msgid "Anonymous overlay network" -msgstr "شبكة غطاء مجهولة" +#: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 +msgid "I2P Browser" +msgstr "متصفح I2P" #: ../config/chroot_local-includes/usr/share/applications/tails-about.desktop.in.h:2 msgid "Learn more about Tails" @@ -520,6 +520,14 @@ msgstr "إيقاف التشغيل" msgid "Immediately shut down computer" msgstr "اوقف تشغيل الكمبيوتر حالاً" +#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1 +msgid "Tor Browser" +msgstr "متصفح تور" + +#: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 +msgid "Anonymous Web Browser" +msgstr "متصفح إنترنت مخفي" + #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 msgid "Browse the World Wide Web without anonymity" msgstr "تصفح الانترنت دون اخفاء هويتك"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 05 Dec '14

05 Dec '14

commit 05d510480d3a30b12d275fe3400d2ae6c713c4d7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 5 17:45:34 2014 +0000 Update translations for tails-misc --- ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar.po b/ar.po index 8bb27c5..9fafde6 100644 --- a/ar.po +++ b/ar.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 11:29+0100\n" -"PO-Revision-Date: 2014-12-05 17:14+0000\n" +"PO-Revision-Date: 2014-12-05 17:21+0000\n" "Last-Translator: Osama M. Mneina <o.mneina(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -526,7 +526,7 @@ msgstr "متصفح تور" #: ../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2 msgid "Anonymous Web Browser" -msgstr "" +msgstr "متصفح إنترنت مخفي" #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:2 msgid "Browse the World Wide Web without anonymity"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 05 Dec '14

05 Dec '14

commit daf72c542a0fe2a8dfbcb159d25766669ed064cd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 5 17:15:39 2014 +0000 Update translations for tails-misc --- ar.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ar.po b/ar.po index 3abd179..8bb27c5 100644 --- a/ar.po +++ b/ar.po @@ -11,6 +11,7 @@ # Matt Santy <matt_santy(a)hotmail.com>, 2013 # Mohammed ALDOUB <voulnet(a)gmail.com>, 2013 # Osama H. Qasho' <osamah_owis(a)windowslive.com>, 2014 +# Osama M. Mneina <o.mneina(a)gmail.com>, 2014 # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 # محيي الدين <tx99h4(a)hotmail.com>, 2014 # محيي الدين <tx99h4(a)hotmail.com>, 2014 @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-12-02 11:29+0100\n" -"PO-Revision-Date: 2014-12-04 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-12-05 17:14+0000\n" +"Last-Translator: Osama M. Mneina <o.mneina(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -493,7 +494,7 @@ msgstr "تعلم كيف تستخدم Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1 msgid "Anonymous overlay network browser" -msgstr "" +msgstr "متصفح مخفي لشبكة طبقية " #: ../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:2 msgid "I2P Browser"

1 0

[metrics-web/master] Fix gitweb links.
by karsten＠torproject.org 05 Dec '14

05 Dec '14

commit 58a42b6bc39d81c0235539c35895a30f220db0c6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 5 16:22:13 2014 +0100 Fix gitweb links. Spotted by phw on https://collector.tp.o/, but also applies here. --- website/web/WEB-INF/about.jsp | 8 ++++---- website/web/WEB-INF/userstats-bridge-country.jsp | 2 +- website/web/WEB-INF/userstats-bridge-table.jsp | 2 +- website/web/WEB-INF/userstats-bridge-transport.jsp | 2 +- website/web/WEB-INF/userstats-bridge-version.jsp | 2 +- website/web/WEB-INF/userstats-censorship-events.jsp | 2 +- website/web/WEB-INF/userstats-relay-country.jsp | 2 +- website/web/WEB-INF/userstats-relay-table.jsp | 2 +- website/web/WEB-INF/versions.jsp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/website/web/WEB-INF/about.jsp b/website/web/WEB-INF/about.jsp index 7d3e51b..9026133 100644 --- a/website/web/WEB-INF/about.jsp +++ b/website/web/WEB-INF/about.jsp @@ -104,7 +104,7 @@ and that registers itself with the example, "Fast", "Stable"), or roles (for example, "Authority", "HSDir"), as assigned by the <a href="#directory-authority">directory authorities</a> and further defined in the -<a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">directory +<a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">directory protocol specification</a>.</p> <h3>Frequently asked questions</h3> @@ -129,7 +129,7 @@ paper</a> where we describe how we measure potentially sensitive data in the Tor network. Whenever we plan to add new data, this plan needs to go through a rigorous process of writing a -<a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/001-process.…">proposal +<a href="https://gitweb.torproject.org/torspec.git/tree/proposals/001-process.txt">proposal document</a>, which is usually discussed on the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev">public development list</a>, and publicly reviewing code patches on the @@ -182,7 +182,7 @@ counting those requests we can make some rough estimates how many users there are. If you want to learn more, there's a more detailed document available dubbed -<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.…">Questions +<a href="https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt">Questions and answers about user statistics</a>. We also wrote a technical report titled <a href="https://research.torproject.org/techreports/counting-daily-bridge-users-201…">Counting @@ -211,7 +211,7 @@ It simply takes time to report, collect, and process all the data. <br> A: Yes, all raw numbers are available in <a href="stats/">comma-separated value files (.csv)</a>, which have their own -<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/stats-spec.txt">specification +<a href="https://gitweb.torproject.org/metrics-web.git/tree/doc/stats-spec.txt">specification document</a>. In addition to that, the raw data behind those .csv files are available via the <a href="https://collector.torproject.org/">CollecTor service</a>. diff --git a/website/web/WEB-INF/userstats-bridge-country.jsp b/website/web/WEB-INF/userstats-bridge-country.jsp index 814d33d..173e934 100644 --- a/website/web/WEB-INF/userstats-bridge-country.jsp +++ b/website/web/WEB-INF/userstats-bridge-country.jsp @@ -49,7 +49,7 @@ country codes, so that graphs are available for most countries.</p> <p>Download graph as <a href="userstats-bridge-country.pdf${userstats_bridge_country_url}">PDF</a> or <a href="userstats-bridge-country.svg${userstats_bridge_country_url}">SVG</a>. -<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.…">Questions +<a href="https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt">Questions and answers about users statistics</a></p> <h4>Related metrics</h4> diff --git a/website/web/WEB-INF/userstats-bridge-table.jsp b/website/web/WEB-INF/userstats-bridge-table.jsp index a243399..f334fee 100644 --- a/website/web/WEB-INF/userstats-bridge-table.jsp +++ b/website/web/WEB-INF/userstats-bridge-table.jsp @@ -51,7 +51,7 @@ country codes, so that numbers are available for most countries.</p> </c:forEach> </table> <p> -<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.…">Questions +<a href="https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt">Questions and answers about users statistics</a></p> <h4>Related metrics</h4> diff --git a/website/web/WEB-INF/userstats-bridge-transport.jsp b/website/web/WEB-INF/userstats-bridge-transport.jsp index b9e4e04..1a8ad88 100644 --- a/website/web/WEB-INF/userstats-bridge-transport.jsp +++ b/website/web/WEB-INF/userstats-bridge-transport.jsp @@ -55,7 +55,7 @@ so that graphs are available for different transports.</p> <p>Download graph as <a href="userstats-bridge-transport.pdf${userstats_bridge_transport_url}">PDF</a> or <a href="userstats-bridge-transport.svg${userstats_bridge_transport_url}">SVG</a>. -<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.…">Questions +<a href="https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt">Questions and answers about users statistics</a></p> <h4>Related metrics</h4> diff --git a/website/web/WEB-INF/userstats-bridge-version.jsp b/website/web/WEB-INF/userstats-bridge-version.jsp index a8ac85b..a8ab0c3 100644 --- a/website/web/WEB-INF/userstats-bridge-version.jsp +++ b/website/web/WEB-INF/userstats-bridge-version.jsp @@ -47,7 +47,7 @@ available for both IP versions 4 and 6.</p> <p>Download graph as <a href="userstats-bridge-version.pdf${userstats_bridge_version_url}">PDF</a> or <a href="userstats-bridge-version.svg${userstats_bridge_version_url}">SVG</a>. -<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.…">Questions +<a href="https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt">Questions and answers about users statistics</a></p> <h4>Related metrics</h4> diff --git a/website/web/WEB-INF/userstats-censorship-events.jsp b/website/web/WEB-INF/userstats-censorship-events.jsp index 1400192..c08a2b0 100644 --- a/website/web/WEB-INF/userstats-censorship-events.jsp +++ b/website/web/WEB-INF/userstats-censorship-events.jsp @@ -51,7 +51,7 @@ more details, see this </c:forEach> </table> <p> -<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.…">Questions +<a href="https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt">Questions and answers about users statistics</a></p> <h4>Related metrics</h4> diff --git a/website/web/WEB-INF/userstats-relay-country.jsp b/website/web/WEB-INF/userstats-relay-country.jsp index c27afb1..76b07ba 100644 --- a/website/web/WEB-INF/userstats-relay-country.jsp +++ b/website/web/WEB-INF/userstats-relay-country.jsp @@ -63,7 +63,7 @@ details, see this <p>Download graph as <a href="userstats-relay-country.pdf${userstats_relay_country_url}">PDF</a> or <a href="userstats-relay-country.svg${userstats_relay_country_url}">SVG</a>. -<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.…">Questions +<a href="https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt">Questions and answers about users statistics</a></p> <h4>Related metrics</h4> diff --git a/website/web/WEB-INF/userstats-relay-table.jsp b/website/web/WEB-INF/userstats-relay-table.jsp index d565360..03431fa 100644 --- a/website/web/WEB-INF/userstats-relay-table.jsp +++ b/website/web/WEB-INF/userstats-relay-table.jsp @@ -52,7 +52,7 @@ available for most countries.</p> </c:forEach> </table> <p> -<a href="https://gitweb.torproject.org/metrics-web.git/blob/HEAD:/doc/users-q-and-a.…">Questions +<a href="https://gitweb.torproject.org/metrics-web.git/tree/doc/users-q-and-a.txt">Questions and answers about users statistics</a></p> <h4>Related metrics</h4> diff --git a/website/web/WEB-INF/versions.jsp b/website/web/WEB-INF/versions.jsp index 2e516ce..82e3401 100644 --- a/website/web/WEB-INF/versions.jsp +++ b/website/web/WEB-INF/versions.jsp @@ -24,7 +24,7 @@ More details on when these versions were declared stable or unstable can be found on the <a href="https://www.torproject.org/download/download.html">download page</a> and in the -<a href="https://gitweb.torproject.org/tor.git/blob/HEAD:/ChangeLog">changes file</a>.</p> +<a href="https://gitweb.torproject.org/tor.git/tree/ChangeLog">changes file</a>.</p> <img src="versions.png${versions_url}" width="576" height="360" alt="Relay versions graph"> <form action="versions.html">

1 0

[metrics-db/master] Fix gitweb links.
by karsten＠torproject.org 05 Dec '14

05 Dec '14

commit 1115d5d2b44886548fb3b881f7d66879cf2b2cca Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 5 16:05:54 2014 +0100 Fix gitweb links. Spotted by phw. --- web/formats.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/formats.html b/web/formats.html index b5d56da..41fa35f 100644 --- a/web/formats.html +++ b/web/formats.html @@ -49,11 +49,11 @@ number. Relays and directory authorities publish relay descriptors, so that clients can select relays for their paths through the Tor network. All these relay descriptors are specified in the -<a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">Tor +<a href="https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt">Tor directory protocol, version 3</a> specification document (or in the earlier protocol versions -<a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec-v2.txt">2</a> or -<a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/attic/dir-spec-v1.txt">1</a>). +<a href="https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v2.txt">2</a> or +<a href="https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v1.txt">1</a>). This page shall give a quick overview of what relay descriptors are available. </p>

1 0

[webwml/master] Bump TBB alpha version.
by gk＠torproject.org 05 Dec '14

05 Dec '14

commit 9e37ebb75c6bddf65dcdbac512fb80f2413f5a70 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 5 14:12:28 2014 +0000 Bump TBB alpha version. --- include/versions.wmi | 10 +++++----- projects/torbrowser/RecommendedTBBVersions | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index ace518b..48bc738 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -24,10 +24,10 @@ <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>4.0.2</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>4.5-alpha-1</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-torbrowserbundle whitespace=delete>4.0.2</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>4.5-alpha-1</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.1e</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -39,8 +39,8 @@ <define-tag version-torbrowserbundlelinux32 whitespace=delete>4.0.2</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>4.0.2</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5-alpha-1</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>4.5-alpha-2</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.21-stable, zlib-1.2.8, openssl-1.0.0k</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> @@ -49,7 +49,7 @@ <define-tag version-torbrowserbundleosx32 whitespace=delete>4.0.2</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>2.3.25-15</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5-alpha-1</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>4.5-alpha-2</define-tag> <define-tag version-osx-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 445021b..c75968c 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,8 +3,8 @@ "4.0.2-Linux", "4.0.2-MacOS", "4.0.2-Windows", -"4.5-alpha-1", -"4.5-alpha-1-Linux", -"4.5-alpha-1-MacOS", -"4.5-alpha-1-Windows" +"4.5-alpha-2", +"4.5-alpha-2-Linux", +"4.5-alpha-2-MacOS", +"4.5-alpha-2-Windows" ]

1 0

[tor-browser-bundle/master] Updated Changelog for 4.5-alpha-2.
by gk＠torproject.org 05 Dec '14

05 Dec '14

commit ce9ae81c8ed530b39ff4be99b2f2053ff74b597c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 5 08:15:38 2014 +0000 Updated Changelog for 4.5-alpha-2. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f1511b0..11cf88b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -8,6 +8,7 @@ Tor Browser 4.5-alpha-2 -- Dec 5 2014 * Bug 13671: Make bridges visible on circuit display * Bug 9387: Incorporate user feedback * Bug 13784: Remove third party authentication tokens + * Bug 13435: Remove our custom POODLE fix (fixed by Mozilla in ESR 31.3.0) Tor Browser 4.0.2 -- Dec 2 2014 * All Platforms

1 0

[tor-messenger-build/master] Enable shipping the SPI root cert and disable jabber.ccc.de
by sukhbir＠torproject.org 05 Dec '14

05 Dec '14

commit b4c3d3190360a81a02bca78f312d29aa46f222bc Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Dec 5 10:20:33 2014 +0530 Enable shipping the SPI root cert and disable jabber.ccc.de --- projects/instantbird/build | 3 +- projects/instantbird/ccc-jabber-cacert.der | 170 ---------------------------- projects/instantbird/config | 1 + 3 files changed, 2 insertions(+), 172 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index a925891..0a6dbe3 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -37,8 +37,7 @@ for patch in $(ls -1 ../*.patch | sort) do patch -p1 < $patch done -# cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt -# cat ../ccc-jabber-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt +cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 then diff --git a/projects/instantbird/ccc-jabber-cacert.der b/projects/instantbird/ccc-jabber-cacert.der deleted file mode 100644 index abe8a43..0000000 --- a/projects/instantbird/ccc-jabber-cacert.der +++ /dev/null @@ -1,170 +0,0 @@ - -# -# Certificate "CCC Jabber Service" -# -# Issuer: E=support(a)cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA -# Serial Number: 914674 (0xdf4f2) -# Subject: CN=jabber.ccc.de,O=Chaos Computer Club e.V.,L=Hamburg,ST=Hamburg,C=DE -# Not Valid Before: Thu Oct 17 20:50:19 2013 -# Not Valid After : Sat Oct 17 20:50:19 2015 -# Fingerprint (SHA-256): 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41 -# Fingerprint (SHA1): 4E:09:F9:D9:F2:24:17:46:84:76:8D:46:7A:84:B1:39:B8:6A:02:1F -CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CCC Jabber Service" -CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 -CKA_SUBJECT MULTILINE_OCTAL -\060\154\061\013\060\011\006\003\125\004\006\023\002\104\105\061 -\020\060\016\006\003\125\004\010\023\007\110\141\155\142\165\162 -\147\061\020\060\016\006\003\125\004\007\023\007\110\141\155\142 -\165\162\147\061\041\060\037\006\003\125\004\012\023\030\103\150 -\141\157\163\040\103\157\155\160\165\164\145\162\040\103\154\165 -\142\040\145\056\126\056\061\026\060\024\006\003\125\004\003\023 -\015\152\141\142\142\145\162\056\143\143\143\056\144\145 -END -CKA_ID UTF8 "0" -CKA_ISSUER MULTILINE_OCTAL -\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -\100\143\141\143\145\162\164\056\157\162\147 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\003\015\364\362 -END -CKA_VALUE MULTILINE_OCTAL -\060\202\005\231\060\202\003\201\240\003\002\001\002\002\003\015 -\364\362\060\015\006\011\052\206\110\206\367\015\001\001\005\005 -\000\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157 -\157\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025 -\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 -\164\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031 -\103\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040 -\101\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052 -\206\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162 -\164\100\143\141\143\145\162\164\056\157\162\147\060\036\027\015 -\061\063\061\060\061\067\062\060\065\060\061\071\132\027\015\061 -\065\061\060\061\067\062\060\065\060\061\071\132\060\154\061\013 -\060\011\006\003\125\004\006\023\002\104\105\061\020\060\016\006 -\003\125\004\010\023\007\110\141\155\142\165\162\147\061\020\060 -\016\006\003\125\004\007\023\007\110\141\155\142\165\162\147\061 -\041\060\037\006\003\125\004\012\023\030\103\150\141\157\163\040 -\103\157\155\160\165\164\145\162\040\103\154\165\142\040\145\056 -\126\056\061\026\060\024\006\003\125\004\003\023\015\152\141\142 -\142\145\162\056\143\143\143\056\144\145\060\202\001\042\060\015 -\006\011\052\206\110\206\367\015\001\001\001\005\000\003\202\001 -\017\000\060\202\001\012\002\202\001\001\000\310\261\317\205\204 -\034\231\376\301\360\110\352\155\135\376\122\023\172\361\001\200 -\265\357\075\056\112\164\114\356\131\337\306\274\373\060\275\167 -\201\126\272\032\324\117\037\344\050\310\253\334\114\113\127\071 -\022\362\020\366\163\322\312\174\362\263\326\037\056\002\050\165 -\143\366\111\332\032\130\065\323\252\076\310\143\024\140\026\306 -\307\032\024\351\264\157\102\062\333\010\270\074\154\220\334\116 -\100\047\352\117\102\050\151\277\365\103\176\131\132\141\112\373 -\267\321\037\356\030\327\000\004\216\141\245\247\144\234\146\004 -\227\345\076\145\253\343\066\110\375\066\243\350\152\240\021\235 -\330\026\217\317\212\324\317\375\353\020\101\104\362\045\363\341 -\174\011\361\176\115\047\246\237\266\253\337\215\165\120\015\364 -\202\046\145\112\251\365\072\276\110\144\360\013\214\357\272\205 -\116\056\237\350\213\022\100\246\011\317\174\052\235\142\063\353 -\131\272\201\317\172\373\016\067\050\245\105\056\053\302\213\246 -\100\335\372\252\144\343\246\271\250\125\223\215\332\133\300\361 -\142\106\331\027\257\372\117\303\371\151\151\002\003\001\000\001 -\243\202\001\065\060\202\001\061\060\014\006\003\125\035\023\001 -\001\377\004\002\060\000\060\016\006\003\125\035\017\001\001\377 -\004\004\003\002\003\250\060\064\006\003\125\035\045\004\055\060 -\053\006\010\053\006\001\005\005\007\003\002\006\010\053\006\001 -\005\005\007\003\001\006\011\140\206\110\001\206\370\102\004\001 -\006\012\053\006\001\004\001\202\067\012\003\003\060\063\006\010 -\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006\010 -\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072\057 -\057\157\143\163\160\056\143\141\143\145\162\164\056\157\162\147 -\057\060\061\006\003\125\035\037\004\052\060\050\060\046\240\044 -\240\042\206\040\150\164\164\160\072\057\057\143\162\154\056\143 -\141\143\145\162\164\056\157\162\147\057\162\145\166\157\153\145 -\056\143\162\154\060\163\006\003\125\035\021\004\154\060\152\202 -\015\152\141\142\142\145\162\056\143\143\143\056\144\145\202\030 -\143\157\156\146\145\162\145\156\143\145\056\152\141\142\142\145 -\162\056\143\143\143\056\144\145\202\025\152\141\142\142\145\162 -\144\056\152\141\142\142\145\162\056\143\143\143\056\144\145\202 -\024\160\165\142\163\165\142\056\152\141\142\142\145\162\056\143 -\143\143\056\144\145\202\022\166\152\165\144\056\152\141\142\142 -\145\162\056\143\143\143\056\144\145\060\015\006\011\052\206\110 -\206\367\015\001\001\005\005\000\003\202\002\001\000\077\170\011 -\215\332\027\172\024\250\037\276\341\366\153\301\350\223\321\075 -\260\067\207\060\053\274\153\021\140\104\162\336\315\163\161\073 -\204\346\055\171\316\152\154\346\166\205\016\345\355\027\002\223 -\010\067\115\163\165\276\157\076\060\220\370\204\051\205\020\226 -\043\137\366\120\324\256\114\205\110\175\254\034\174\321\173\243 -\314\001\242\270\206\276\300\147\242\242\032\266\224\072\221\115 -\351\317\140\335\117\226\257\230\127\334\317\240\143\125\065\230 -\227\315\225\163\023\002\225\161\247\043\244\311\200\137\150\264 -\221\361\053\322\016\000\316\071\327\302\064\146\314\046\243\106 -\074\056\134\313\032\307\067\054\373\260\115\224\260\215\143\045 -\017\125\042\027\126\024\245\176\125\146\147\146\060\171\107\026 -\304\110\360\117\375\162\361\307\300\016\323\311\271\242\352\147 -\041\143\212\133\026\255\112\163\003\304\067\040\301\153\243\070 -\107\116\212\375\063\241\242\060\053\033\012\220\353\252\361\147 -\151\157\260\074\004\113\332\144\006\250\052\143\341\014\355\225 -\303\114\026\372\323\002\373\222\206\102\111\244\324\334\046\352 -\072\004\253\337\077\220\322\274\016\172\055\112\226\055\243\070 -\161\107\027\101\017\154\050\276\166\254\317\372\161\155\137\053 -\154\346\301\322\171\140\367\051\343\165\211\141\022\033\124\106 -\012\006\070\337\363\121\356\113\345\271\002\233\156\132\150\101 -\147\135\263\151\107\240\246\047\356\245\154\214\062\003\140\110 -\076\111\367\102\124\164\373\057\263\057\274\141\155\263\205\205 -\246\226\121\233\167\265\222\056\175\063\133\361\362\132\120\055 -\320\357\311\047\241\110\221\023\366\270\074\020\313\074\161\204 -\307\021\273\127\110\201\256\127\015\305\146\104\176\066\051\021 -\222\100\147\360\355\306\343\135\136\052\007\250\243\151\061\167 -\300\105\041\165\107\270\377\312\103\174\017\145\224\237\253\163 -\334\163\103\151\155\006\025\003\004\212\124\037\047\264\124\360 -\025\226\006\370\372\322\154\122\020\327\166\133\004\305\023\063 -\346\077\036\175\155\330\117\225\177\276\151\130\247\271\023\215 -\031\012\373\105\330\215\313\134\136\165\210\116\307\261\254\352 -\356\031\121\144\122\171\156\326\030\374\015\307\225 -END - -# Trust for "CCC Jabber Service" -# Issuer: E=support(a)cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA -# Serial Number: 914674 (0xdf4f2) -# Subject: CN=jabber.ccc.de,O=Chaos Computer Club e.V.,L=Hamburg,ST=Hamburg,C=DE -# Not Valid Before: Thu Oct 17 20:50:19 2013 -# Not Valid After : Sat Oct 17 20:50:19 2015 -# Fingerprint (SHA-256): 63:0F:F6:2F:26:2E:2E:D3:52:4E:03:1F:39:1B:72:96:FD:09:9E:CA:10:64:76:88:74:C4:49:52:6F:94:A5:41 -# Fingerprint (SHA1): 4E:09:F9:D9:F2:24:17:46:84:76:8D:46:7A:84:B1:39:B8:6A:02:1F -CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST -CKA_TOKEN CK_BBOOL CK_TRUE -CKA_PRIVATE CK_BBOOL CK_FALSE -CKA_MODIFIABLE CK_BBOOL CK_FALSE -CKA_LABEL UTF8 "CCC Jabber Service" -CKA_CERT_SHA1_HASH MULTILINE_OCTAL -\116\011\371\331\362\044\027\106\204\166\215\106\172\204\261\071 -\270\152\002\037 -END -CKA_CERT_MD5_HASH MULTILINE_OCTAL -\014\101\362\053\214\147\235\160\222\215\317\335\363\117\200\301 -END -CKA_ISSUER MULTILINE_OCTAL -\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 -\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150 -\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164 -\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103 -\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101 -\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206 -\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164 -\100\143\141\143\145\162\164\056\157\162\147 -END -CKA_SERIAL_NUMBER MULTILINE_OCTAL -\002\003\015\364\362 -END -CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR -CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/projects/instantbird/config b/projects/instantbird/config index 30af0f4..d69d5cc 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -56,6 +56,7 @@ input_files: - name: mozilla-src project: mozilla pkg_type: src + - filename: spi-cacert.der - filename: preferences.patch - filename: prepare-messages-for-displaying.patch - filename: test-transformation-api.patch

1 0

[tor-messenger-build/master] Merge branch 'master' of git-rw.torproject.org:tor-messenger-build
by sukhbir＠torproject.org 05 Dec '14

05 Dec '14

commit 6452217760088fd1b91245658ee343098238ca33 Merge: b4c3d31 bbf2029 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Dec 5 10:21:34 2014 +0530 Merge branch 'master' of git-rw.torproject.org:tor-messenger-build

1 0