- tor-commits - lists.torproject.org

[webwml/master] Remove N900 instructions
by sebastian＠torproject.org 05 Feb '16

05 Feb '16

commit 152760b21b5ca6d7fbb14ec9cdf39ccd7570f07b Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 5 21:46:03 2016 +0100 Remove N900 instructions Implements #16605. I think N900s are pretty rare now, and instructions for 0.2.1.x aren't really that useful anymore anyway. --- .gitignore | 1 - docs/en/N900.wml | 191 ------------------------------------------ docs/en/sidenav.wmi | 3 - docs/torbutton/en/sidenav.wmi | 3 - download/en/download.wml | 8 -- 5 files changed, 206 deletions(-) diff --git a/.gitignore b/.gitignore index 1965530..fa0eba6 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,6 @@ about/sponsors.html.en about/torusers.html.en about/translators.html.en about/volunteers.html.en -docs/N900.html.en docs/android.html.en docs/bridges.html.en docs/debian.html.en diff --git a/docs/en/N900.wml b/docs/en/N900.wml deleted file mode 100644 index c21d36b..0000000 --- a/docs/en/N900.wml +++ /dev/null @@ -1,191 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor Project: N900 Instructions" CHARSET="UTF-8" - - - -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page docs/documentation>">Documentation » </a> - <a href="<page docs/N900>">N900</a> - </div> - <div id="maincol"> - <a id="Maemo"></a> - <h2><a class="anchor" href="#Maemo">Installing Tor on Maemo</a></h2> - <br> - <p> - If you have a Maemo device that is not the <a href="#N900">N900</a>, we - suggest you install the Tor package from the - <a href="http://maemo.org/packages/view/tor/">Maemo website</a>. The Tor - Project does not produce these packages. They are maintained by the - Maemo community. - </p> - - <a id="N900"></a> - <h2><a class="anchor" href="#N900">Installing Tor on the N900</a></h2> - <br> - <p> - The following instructions should help install an - <a href="https://garage.maemo.org/projects/tor-status">experimental - Tor controller</a> and Tor as packaged for the N900 Nokia telephone. This is - currently an untested configuration. The browser in this configuration does - not have Torbutton and it should not be used for high security anonymity needs - at this time. - </p> - - <p> - Open the Application manager: <br> - <a href="$(IMGROOT)/N900/1_app_menu.png"> - <img alt="N900 application menu" - src="$(IMGROOT)/N900/1_app_menu-small.png"/> - </a> - </p> - - <p> - Click on the Application manager menu at the top of the screen: <br> - <a href="$(IMGROOT)/N900/2_app_manager.png"> - <img alt="N900 application manager" - src="$(IMGROOT)/N900/2_app_manager-small.png"/> - </a> - </p> - - <p> - Select 'Application catalogs': <br> - <a href="$(IMGROOT)/N900/3_app_managermenu.png"> - <img alt="N900 application catalogs" - src="$(IMGROOT)/N900/3_app_managermenu-small.png"/> - </a> - </p> - - <p> - Press 'New' to enable the maemo extras-devel repository. <br> - <small>Note: This repository contains untested packages that might harm your - device. <br> - See <a href="http://wiki.maemo.org/Extras-devel">Extras-devel</a> for - details. You should probably disable extras-devel after installing Tor, or - proceed at your own risk.</small> - <br> - <a href="$(IMGROOT)/N900/4_catalog_list.png"> - <img alt="N900 catalog list" - src="$(IMGROOT)/N900/4_catalog_list-small.png"/> - </a> - </p> - - <p> - Enter the following information into the catalog addition screen: - <p> - <pre> - Catalog name: Extras devel - Web address: http://repository.maemo.org/extras-devel/ - Distribution: fremantle - Components: free non-free - </pre> - </p> - <br> - Make sure 'Disabled' is unchecked, hit 'Save', and wait for the package list - to update.<br> - <a href="$(IMGROOT)/N900/5_new_catalog.png"> - <img alt="N900 new catalog" - src="$(IMGROOT)/N900/5_new_catalog-small.png"/> - </a> - </p> - - <p> - Press 'Download' in the App manager: <br> - <a href="$(IMGROOT)/N900/6_app_manager.png"> - <img alt="N900 app manager" - src="$(IMGROOT)/N900/6_app_manager-small.png"/> - </a> - </p> - - <p> - Select the Network category (or search for Tor): <br> - <a href="$(IMGROOT)/N900/7_app_categories.png"> - <img alt="N900 application categories" - src="$(IMGROOT)/N900/7_app_categories-small.png"/> - </a> - </p> - - <p> - Scroll down and select 'Tor Status Area Applet': <br> - <a href="$(IMGROOT)/N900/8_app_list.png"> - <img alt="N900 application list" - src="$(IMGROOT)/N900/8_app_list-small.png"/> - </a> - </p> - - <p> - Agree to the disclaimer and press 'Continue': <br> - <a href="$(IMGROOT)/N900/9_disclaimer.png"> - <img alt="N900 disclaimer" - src="$(IMGROOT)/N900/9_disclaimer-small.png"/> - </a> - </p> - - <p> - When the install is done, disable the extras-devel repository, and reboot - the device: <br> - <a href="$(IMGROOT)/N900/10_success.png"> - <img alt="N900 success" - src="$(IMGROOT)/N900/10_success-small.png"/> - </a> - </p> - - <p> - After rebooting the N900, open the status menu: <br> - <a href="$(IMGROOT)/N900/11_after_rebooting.png"> - <img alt="N900 status menu post-reboot" - src="$(IMGROOT)/N900/11_after_rebooting-small.png"/> - </a> - </p> - - <p> - Select 'The Onion Router' from the list: <br> - <a href="$(IMGROOT)/N900/12_status_menu.png"> - <img alt="N900 status menu selection" - src="$(IMGROOT)/N900/12_status_menu-small.png"/> - </a> - </p> - - <p> - Enable onion routing, and press 'Save': <br> - <a href="$(IMGROOT)/N900/13_enable_tor.png"> - <img alt="N900 enabling Tor" - src="$(IMGROOT)/N900/13_enable_tor-small.png"/> - </a> - </p> - - <p> - Visit <a href="https://check.torproject.org/">TorCheck</a> to confirm that - you are routing browser traffic through Tor: <br> - <a href="$(IMGROOT)/N900/14_check_tor.png"> - <img alt="N900 check Tor" - src="$(IMGROOT)/N900/14_check_tor-small.png"/> - </a> - </p> - - <p> - Note that this might not always give you the latest stable Tor version. - Additionally, the N900 web browser does not have Torbutton. This means that - while it may be useful for circumvention, it probably is unsuitable for strong - web browser anonymity requirements. - </p> - - <hr> - - <p>If you have suggestions for improving this document, please <a - href="<page about/contact>">send them to us</a>. Thanks!</p> - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> - diff --git a/docs/en/sidenav.wmi b/docs/en/sidenav.wmi index 35a9f36..43ed5ec 100644 --- a/docs/en/sidenav.wmi +++ b/docs/en/sidenav.wmi @@ -42,9 +42,6 @@ {'url' => 'docs/android', 'txt' => 'Installing Tor on Android', }, - {'url' => 'docs/N900', - 'txt' => 'Installing Tor on Maemo/N900', - }, {'url' => 'docs/verifying-signatures', 'txt' => 'Verify our GPG signatures', }], diff --git a/docs/torbutton/en/sidenav.wmi b/docs/torbutton/en/sidenav.wmi index 1b4e3ae..091a349 100644 --- a/docs/torbutton/en/sidenav.wmi +++ b/docs/torbutton/en/sidenav.wmi @@ -39,9 +39,6 @@ {'url' => 'docs/android', 'txt' => 'Installing Tor on Android', }, - {'url' => 'docs/N900', - 'txt' => 'Installing Tor on Maemo/N900', - }, {'url' => 'docs/verifying-signatures', 'txt' => 'Verify our GPG signatures', }], diff --git a/download/en/download.wml b/download/en/download.wml index 77dee1d..92b550f 100644 --- a/download/en/download.wml +++ b/download/en/download.wml @@ -176,14 +176,6 @@ custom configurations. All an apt-get or yum install away.</p> <h2>Android Bundle</h2> <p>Our software is available for Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://play.google.com/store/apps/details?id=org.torproject.android">Google Play Store</a>.</p> </div> - - <div class="package" style="border-bottom: 0px;"> - <div class="downloads"> - <a class="additional" style="font-weight: bold;" href="<page docs/N900>">Experimental Instructions</a> - </div> - - <h2>Nokia Maemo/N900</h2> - </div> </div>

1 0

[webwml/master] fix this faster than arma can read website changelog mails
by sebastian＠torproject.org 05 Feb '16

05 Feb '16

commit 6ee5018f37bf25db4d7c45109e055472c9324d26 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 5 21:44:06 2016 +0100 fix this faster than arma can read website changelog mails --- docs/en/tor-doc-relay.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml index 207826e..c932c33 100644 --- a/docs/en/tor-doc-relay.wml +++ b/docs/en/tor-doc-relay.wml @@ -24,7 +24,7 @@ <p>You can run a Tor relay on pretty much any operating system. Tor relays work best on current distributions of Linux, FreeBSD, NetBSD, and - Windows Server or later. + Windows Server. </p> <p>

1 0

[webwml/master] Remove suggestion to run a relay with Tor Browser
by sebastian＠torproject.org 05 Feb '16

05 Feb '16

commit dd2563413c8f74d097c7b70f19a47e972931c51f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Fri Feb 5 21:33:59 2016 +0100 Remove suggestion to run a relay with Tor Browser Fixes #16704. Also de-emphasize some other OSes. Relays belong in data centers these days --- docs/en/tor-doc-relay.wml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml index e2053bf..207826e 100644 --- a/docs/en/tor-doc-relay.wml +++ b/docs/en/tor-doc-relay.wml @@ -23,8 +23,8 @@ </p> <p>You can run a Tor relay on pretty much any operating system. Tor relays - work best on Linux, OS X Lion or later, FreeBSD 5.x+, NetBSD 5.x+, and - Windows Server 2003 or later. + work best on current distributions of Linux, FreeBSD, NetBSD, and + Windows Server or later. </p> <p> @@ -37,15 +37,6 @@ with those operating systems. </p> - <p>Alas, since Vidalia (a graphical interface for Tor) is <a - href="<page docs/faq>#WhereDidVidaliaGo">no longer included</a> - in Tor Browser, there are currently no - easy relay packages for Windows and OS X users. One option might be to run - Debian in a VM, or use a different means of getting a Tor binary on - your system (Expert Bundle, Homebrew, Macports). Please help make - this process easier! - </p> - <hr> <a id="torrc"></a> <h2><a class="anchor" href="#torrc">Configure Tor by editing the torrc file</a></h2> @@ -53,10 +44,9 @@ <p> Tor's - configuration file is named 'torrc'. In the Tor Browser folder, it's - located at</p> - <pre>Data\Tor\torrc</pre> - <p>Open the file with a text editor and add the following lines:</p> + configuration file is named 'torrc'.</p> + <p>Locate the file on your system, open it with a text editor and add the + following lines:</p> <pre> ORPort 443

1 0

[webwml/master] Changed portinstall to pkg (freebsd)
by sebastian＠torproject.org 05 Feb '16

05 Feb '16

commit a32842496a8f6acb0f91ed9290eba29d96190e76 Author: ilv <ilv(a)users.noreply.github.com> Date: Sun Feb 22 19:38:46 2015 -0300 Changed portinstall to pkg (freebsd) --- download/en/download-unix.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download/en/download-unix.wml b/download/en/download-unix.wml index 23b5c40..827a8b9 100644 --- a/download/en/download-unix.wml +++ b/download/en/download-unix.wml @@ -55,7 +55,7 @@ <tr class="beige"> <td align="center"><img src="$(IMGROOT)/distros/freebsd.png" alt="FreeBSD"></td> <td>FreeBSD</td> -<td colspan="2"><kbd>portinstall -s security/tor</kbd></td> +<td colspan="2"><kbd>pkg install tor</kbd></td> <td><a href="<page docs/tor-doc-unix>">Linux/BSD/Unix</a></td> </tr>

1 0

[webwml/master] Completely removed img border
by sebastian＠torproject.org 05 Feb '16

05 Feb '16

commit 51f6ab74beb649d975fc933a0be5501eedb4d9e8 Author: ilv <ilv(a)users.noreply.github.com> Date: Sun Feb 22 19:42:19 2015 -0300 Completely removed img border --- css/layout.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/layout.css b/css/layout.css index 4908ee0..c65126b 100644 --- a/css/layout.css +++ b/css/layout.css @@ -396,7 +396,7 @@ td { padding: 12px; } table td img, table tr img { - border: 1px solid #cac8a7; + border: none; float: left; margin-right: 10px; }

1 0

[torspec/master] Changes to prop250 after reading group and Nick's comments.
by asn＠torproject.org 05 Feb '16

05 Feb '16

commit 664829e0d6614ac3a225e4f372f2b86c8f36b600 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 5 18:21:39 2016 +0200 Changes to prop250 after reading group and Nick's comments. - Remove ed25519 keys completely. Use RSA keys for referencing. - Replace SHA256 with SHA3-256 (Keccak). - Specify better the format and contents of TIMESTAMP. - Put TIMESTAMP in the front of COMMIT for symmetry with REVEAL. - Use base64 not base32. - Specify what happens when PREVIOUS_SRV is unknown. - Remove some paragraphs that are no longer valid. - Simplify consistent ordering in HASHED_REVEALS. - Put algorithm name first on disk and commit. --- proposals/250-commit-reveal-consensus.txt | 79 ++++++++++--------------------- 1 file changed, 26 insertions(+), 53 deletions(-) diff --git a/proposals/250-commit-reveal-consensus.txt b/proposals/250-commit-reveal-consensus.txt index 20f5036..c2d1981 100644 --- a/proposals/250-commit-reveal-consensus.txt +++ b/proposals/250-commit-reveal-consensus.txt @@ -35,7 +35,6 @@ Supersedes: 225 4.1.2. Validating commitments and reveals [VALIDATEVALUES] 4.1.4. Encoding commit/reveal values in votes [COMMITVOTE] 4.1.5. Shared Random Value [SRVOTE] - 4.1.6. Including the ed25519 identity key in votes [SRKEY] 4.2. Encoding Shared Random Values in the consensus [SRCONSENSUS] 4.3. Persistent state format [STATEFORMAT] 5. Security Analysis @@ -264,10 +263,6 @@ Supersedes: 225 authoritative commits they have received from each authority. Only one commit per authority must be considered trusted and active at a given time. - An authority that just received a commitment from another authority's vote - MUST wait till the next voting round to include that commitment value in its - own votes. - 3.2 Reveal Phase The reveal phase lasts from 12:00UTC to 00:00UTC. @@ -322,24 +317,19 @@ Supersedes: 225 HASHED_REVEALS = H(ID_a | R_a | ID_b | R_b | ..) - SRV = HMAC(HASHED_REVEALS, - "shared-random" | INT_8(reveal_num) | INT_8(version) | - previous_SRV) + SRV = SHA3-256("shared-random" | INT_8(REVEAL_NUM) | INT_8(VERSION) | + HASHED_REVEALS | PREVIOUS_SRV) where the ID_a value is the identity key fingerprint of authority 'a' and R_a is the corresponding reveal value of that authority for the current period. - Also, "reveal_num" is the number of revealed values in this construction, - "version" is the protocol version number and "previous_SRV" is the previous - shared random value if any. - - To maintain consistent ordering, ID_a | R_a pairs are ordered based on the - base64 encoded SR key of the authority in ascending order. - - For protocol version 1, H is SHA256 and HMAC is HMAC-SHA256. + Also, REVEAL_NUM is the number of revealed values in this construction, + VERSION is the protocol version number and PREVIOUS_SRV is the previous + shared random value. If no previous shared random value is known, then + PREVIOUS_SRV is set to 32 NUL (\x00) bytes. - XXX We need to make sure that all dirauths know the previous_SRV here. - Otherwise, they might partition accidentally when calculating the SRV. + To maintain consistent ordering in HASHED_REVEALS, all the ID_a | R_a pairs + are ordered based on the R_a value in ascending order. 3.4. Bootstrapping Procedure @@ -393,15 +383,20 @@ Supersedes: 225 The value REVEAL is computed as follows: - REVEAL = base32-encode( TIMESTAMP || H(RN) ) + REVEAL = base64-encode( TIMESTAMP || H(RN) ) - where RN is the sha256 hashed value of a 256-bit random value. We hash - the random value to avoid exposing raw bytes from our PRNG to the network - (see [RANDOM-REFS]). + where RN is the SHA3 hashed value of a 256-bit random value. We hash the + random value to avoid exposing raw bytes from our PRNG to the network (see + [RANDOM-REFS]). + + TIMESTAMP is an 8-bytes network-endian time_t value. Authorities SHOULD + set TIMESTAMP to the valid-after time of the vote document they first plan + to publish their commit into (so usually at 00:00UTC, except if they start + up in a later commit round). The value COMMIT is computed as follows: - COMMIT = base32-encode( H(H(RN)) || TIMESTAMP ) + COMMIT = base64-encode( TIMESTAMP || H(H(RN)) ) where RN is the random value from REVEAL. @@ -425,14 +420,14 @@ Supersedes: 225 seen from the other authorities. To do so, it includes the following in its votes: - "shared-rand-commit" SP IDENTITY SP ALGNAME SP COMMIT [SP REVEAL] NL + "shared-rand-commit" SP ALGNAME SP IDENTITY SP COMMIT [SP REVEAL] NL - where IDENTITY is the authority's ed25519 identity key [SRKEY] and COMMIT is - the encoded commit [COMMITREVEAL]. Authorities during the reveal phase can - also optionally include an encoded reveal value REVEAL. There MUST be only - one line per authority else the vote is considered invalid. Finally, the - ALGNAME is the hash algorithm that should be used to compute COMMIT and - REVEAL which is "sha256" for version 1. + where IDENTITY is the authority's SHA1 identity fingerprint and COMMIT is the + encoded commit [COMMITREVEAL]. Authorities during the reveal phase can also + optionally include an encoded reveal value REVEAL. There MUST be only one + line per authority else the vote is considered invalid. Finally, the ALGNAME + is the hash algorithm that should be used to compute COMMIT and REVEAL which + is "sha3-256" for version 1. 4.1.5. Shared Random Value [SRVOTE] @@ -449,28 +444,6 @@ Supersedes: 225 To maintain consistent ordering, the shared random values of the previous period should be listed before the values of the current period. -4.1.6. Including the ed25519 identity key in votes [SRKEY] - - We don't want to use the legacy RSA keys as part of the shared randomness - protocol since they are going to be deprecated soon. - - For this reason we want each dirauth to include its ed25519 identity key in - its votes. To do so we include the following block in vote documents as part - of the dir-source block: - - "signing-ed25519" NL "-----BEGIN ED25519 CERT-----" NL certificate - "-----END ED25519 CERT-----" NL - - [At most once] - - The certificate is a base64-encoded Ed25519 certificate (see - cert-spec.txt) terminating =s removed. - - The certificate has CERT_TYPE of [04] and it certifies the ed25519 - master signing key under the ed25519 master key. The certificate also - includes the ed25519 master key in it certifying it under the RSA master - key (since it's included in a vote which is signed by the RSA key). - 4.2. Encoding Shared Random Values in the consensus [SRCONSENSUS] Authorities insert the two active shared random values in the consensus @@ -505,7 +478,7 @@ Supersedes: 225 The following details the commitment and reveal section. They are encoded the same as in the vote. This makes it easier for implementation purposes. - "Commit" SP identity SP algname SP commit [SP reveal] NL + "Commit" SP algname SP identity SP commit [SP reveal] NL [Exactly once per authority]

1 0

[webwml/master] Add new Tor Browser version
by gk＠torproject.org 05 Feb '16

05 Feb '16

commit e2b61d800eefd57c9e8434047d8b24f26a244d25 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 5 13:55:30 2016 +0000 Add new Tor Browser version --- include/versions.wmi | 12 ++++++------ projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 75d46bc..65b77ac 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -18,10 +18,10 @@ <define-tag version-osx-ppc-stable whitespace=delete>0.2.3.25</define-tag> <define-tag version-osx-ppc-alpha whitespace=delete>0.2.4.17-rc</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>5.5</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a1</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>5.5</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>6.0a1</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> @@ -31,8 +31,8 @@ <define-tag version-torbrowser-otr whitespace=delete>3.2</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.1</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a1</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a1</define-tag> <define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.4.19</define-tag> @@ -40,8 +40,8 @@ <define-tag version-gnu-torbrowser-firefox whitespace=delete>24.2.0esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.5.2</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.1</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.1</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a1</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> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 78a4505..6756af7 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "5.5-Linux", "5.5-MacOS", "5.5-Windows", +"5.5.1", +"5.5.1-Linux", +"5.5.1-MacOS", +"5.5.1-Windows", "6.0a1", "6.0a1-Linux", "6.0a1-MacOS",

1 0

[tor/master] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 05 Feb '16

05 Feb '16

commit f06d9a9cef036fc4da995f3ffda8e7a7770d0b74 Merge: 9ca3295 d5ac79e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 5 08:13:13 2016 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/geoip-february2016 | 4 + src/config/geoip | 2144 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 864 ++++++++++++++---- 3 files changed, 2328 insertions(+), 684 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7
by nickm＠torproject.org 05 Feb '16

05 Feb '16

commit d920cbb82c2203b328d66d6c9d8f28fd35608560 Merge: 7d1fe7c 44ad3be Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 5 08:13:35 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/geoip-february2016 | 4 + src/config/geoip | 2144 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 864 ++++++++++++++---- 3 files changed, 2328 insertions(+), 684 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 05 Feb '16

05 Feb '16

commit 44ad3be221fb8e5e648c6d56054fb1d8596a645b Merge: e2efa9e f06d9a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 5 08:13:24 2016 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/geoip-february2016 | 4 + src/config/geoip | 2144 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 864 ++++++++++++++---- 3 files changed, 2328 insertions(+), 684 deletions(-)

1 0