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

[compass/master] Merge remote-tracking branch 'mzeltner/master'
by karsten＠torproject.org 20 Aug '12

20 Aug '12

commit 88c67e0a5b4b03ed33e9d487ed9961dbb5aa4e72 Merge: e0f2eb1 716f196 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 11:10:57 2012 +0200 Merge remote-tracking branch 'mzeltner/master' compass.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

1 0

[compass/master] Updating all paths to details.json
by karsten＠torproject.org 20 Aug '12

20 Aug '12

commit 716f1960c39fcf080376528e30d39d91a252a64e Author: Michael Zeltner <m(a)niij.org> Date: Fri Aug 17 22:40:42 2012 +0200 Updating all paths to details.json --- compass.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compass.py b/compass.py index 0bacc05..4d350b4 100755 --- a/compass.py +++ b/compass.py @@ -289,7 +289,7 @@ def create_option_parser(): def download_details_file(): url = urllib.urlopen('https://onionoo.torproject.org/details?type=relay') - details_file = open("details.json", 'w') + details_file = open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'details.json'), 'w') details_file.write(url.read()) url.close() details_file.close() @@ -307,7 +307,7 @@ if '__main__' == __name__: print "Downloaded details.json. Re-run without --download option." exit() - if not os.path.exists('details.json'): + if not os.path.exists(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'details.json')): parser.error("Did not find details.json. Re-run with --download.") stats = RelayStats(options)

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 20 Aug '12

20 Aug '12

commit eddcfd919784c5d07e5f78459168ffbbdccd73a3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 20 07:45:31 2012 +0000 Update translations for torcheck_completed --- id/torcheck.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/id/torcheck.po b/id/torcheck.po index 3827341..34b9dbd 100644 --- a/id/torcheck.po +++ b/id/torcheck.po @@ -3,13 +3,14 @@ # # Translators: # <gibransyah(a)gmail.com>, 2012. +# <SecretCommission(a)tormail.org>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-05-31 18:32+0000\n" -"Last-Translator: brain90 <gibransyah(a)gmail.com>\n" +"PO-Revision-Date: 2012-08-20 07:17+0000\n" +"Last-Translator: SecretCommision <SecretCommission(a)tormail.org>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgid "" msgstr "Silahkan kunjungi <a href=\"https://www.torproject.org/\">website Tor</a> untuk informasi lebih lengkap mengenai bagaimana menggunakan Tor dengan aman. Saat ini anda telah bebas berselancar di internet secara anonim." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "Tersedia paket pemutakhiran keamanan pada paket Tor Browser." +msgstr "Tersedia paket pemutakhiran keamanan pada paket Browser Tor." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click "

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 20 Aug '12

20 Aug '12

commit a33505fce248dd4d09df1e4d708e7dbdbfc999ea Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 20 07:45:29 2012 +0000 Update translations for torcheck --- id/torcheck.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/id/torcheck.po b/id/torcheck.po index 3827341..34b9dbd 100644 --- a/id/torcheck.po +++ b/id/torcheck.po @@ -3,13 +3,14 @@ # # Translators: # <gibransyah(a)gmail.com>, 2012. +# <SecretCommission(a)tormail.org>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-05-31 18:32+0000\n" -"Last-Translator: brain90 <gibransyah(a)gmail.com>\n" +"PO-Revision-Date: 2012-08-20 07:17+0000\n" +"Last-Translator: SecretCommision <SecretCommission(a)tormail.org>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgid "" msgstr "Silahkan kunjungi <a href=\"https://www.torproject.org/\">website Tor</a> untuk informasi lebih lengkap mengenai bagaimana menggunakan Tor dengan aman. Saat ini anda telah bebas berselancar di internet secara anonim." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "Tersedia paket pemutakhiran keamanan pada paket Tor Browser." +msgstr "Tersedia paket pemutakhiran keamanan pada paket Browser Tor." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click "

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 20 Aug '12

20 Aug '12

commit 4a2d94d47a7fded0a9b78200b4fe2fc62ae47c95 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 20 07:45:25 2012 +0000 Update translations for vidalia_help_completed --- id/index.po | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/id/index.po b/id/index.po new file mode 100644 index 0000000..df8c8ce --- /dev/null +++ b/id/index.po @@ -0,0 +1,47 @@ +# +# Translators: +# <SecretCommission(a)tormail.org>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2010-06-26 16:59+0200\n" +"PO-Revision-Date: 2012-08-20 07:28+0000\n" +"Last-Translator: SecretCommision <SecretCommission(a)tormail.org>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: id\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. type: Content of: <html><body><h1> +#: en/index.html:16 +msgid "Vidalia Help" +msgstr "Bantuan Vidalia" + +#. type: Content of: <html><body><p> +#: en/index.html:20 +msgid "" +"Select a help topic from the tree on the left or click on the Search button " +"above the list of topics to search through all available help topics." +msgstr "Pilih topik bantuan dari daftar di sebelah kiri atau klik pada tombo cari diatas daftar topik-topik untuk mencari melalui semua topik bantuan yang tersedia." + +#. type: Content of: <html><body><p> +#: en/index.html:25 +msgid "" +"You can use the <i>Find</i> button on the toolbar above to search within a " +"particular help topic." +msgstr "Anda dapat menggunakan tombol <i>Find</i> pada toolbar diatas untuk mencari dalam topik bantuan tertentu." + +#. type: Content of: <html><body><p> +#: en/index.html:30 +msgid "The <i>Home</i> button above will bring you back to this home page." +msgstr "Tombol <i>Home</i> diatas akan membawa Anda kembali ke halaman home" + +#. type: Content of: <html><body><p> +#: en/index.html:34 +msgid "" +"See the <a href=\"links.html\">Helpful Links</a> topic for some places you " +"can visit to find additional help and information about Vidalia and Tor." +msgstr "Lihat topik <a href=\"links.html\">Helpful Links</a> untuk beberapa tempat yang bisa Anda kunjungi untuk menemukan bantuan tambahan dan informasi mengenai Vidalia dan Tor."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 20 Aug '12

20 Aug '12

commit bc829dee45ed8b663033e4ea8d1664cdd7285c72 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 20 07:45:20 2012 +0000 Update translations for vidalia_help --- id/index.po | 17 ++++++++--------- id/server.po | 2 -- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/id/index.po b/id/index.po index 3864610..df8c8ce 100644 --- a/id/index.po +++ b/id/index.po @@ -1,12 +1,13 @@ # # Translators: +# <SecretCommission(a)tormail.org>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-08-20 07:28+0000\n" +"Last-Translator: SecretCommision <SecretCommission(a)tormail.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,32 +18,30 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/index.html:16 msgid "Vidalia Help" -msgstr "" +msgstr "Bantuan Vidalia" #. type: Content of: <html><body><p> #: en/index.html:20 msgid "" "Select a help topic from the tree on the left or click on the Search button " "above the list of topics to search through all available help topics." -msgstr "" +msgstr "Pilih topik bantuan dari daftar di sebelah kiri atau klik pada tombo cari diatas daftar topik-topik untuk mencari melalui semua topik bantuan yang tersedia." #. type: Content of: <html><body><p> #: en/index.html:25 msgid "" "You can use the <i>Find</i> button on the toolbar above to search within a " "particular help topic." -msgstr "" +msgstr "Anda dapat menggunakan tombol <i>Find</i> pada toolbar diatas untuk mencari dalam topik bantuan tertentu." #. type: Content of: <html><body><p> #: en/index.html:30 msgid "The <i>Home</i> button above will bring you back to this home page." -msgstr "" +msgstr "Tombol <i>Home</i> diatas akan membawa Anda kembali ke halaman home" #. type: Content of: <html><body><p> #: en/index.html:34 msgid "" "See the <a href=\"links.html\">Helpful Links</a> topic for some places you " "can visit to find additional help and information about Vidalia and Tor." -msgstr "" - - +msgstr "Lihat topik <a href=\"links.html\">Helpful Links</a> untuk beberapa tempat yang bisa Anda kunjungi untuk menemukan bantuan tambahan dan informasi mengenai Vidalia dan Tor." diff --git a/id/server.po b/id/server.po index 84538cd..31027fc 100644 --- a/id/server.po +++ b/id/server.po @@ -401,5 +401,3 @@ msgid "" "<i>Directory Port</i>. The <i>Directory Port</i> is set to port 9030 by " "default on all operating systems." msgstr "" - -

1 0

[atlas/master] Fix three columns in search results.
by karsten＠torproject.org 20 Aug '12

20 Aug '12

commit f518d2c2c28365542dd8ade0ad1a8c46401a8f92 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 9 16:27:44 2012 +0200 Fix three columns in search results. Onionoo doesn't include or_address, or_port, and dir_port fields anymore, but or_addresses and dir_address. Extract values from those fields for the search results table. --- js/models/relay.js | 3 +++ templates/search/do.html | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/js/models/relay.js b/js/models/relay.js index e1393d4..49ba0ca 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -138,6 +138,9 @@ define([ relay.bandwidth = bw; relay.family = relay.family ? relay.family : null; relay.bandwidth_hr = hrBandwidth(bw); + relay.or_address = relay.or_addresses ? relay.or_addresses[0].split(":")[0] : null; + relay.or_port = relay.or_addresses ? relay.or_addresses[0].split(":")[1] : 0; + relay.dir_port = relay.dir_address ? relay.dir_address.split(":")[1] : 0; relay.country = relay.country.toLowerCase(); relay.countryname = CountryCodes[relay.country]; relay.uptime = model.parsedate(relay.last_restarted); diff --git a/templates/search/do.html b/templates/search/do.html index 4ba5ef8..ee3a391 100644 --- a/templates/search/do.html +++ b/templates/search/do.html @@ -64,7 +64,7 @@ Please report which browser/addons/etc. you're using to <a href="https://trac.to <img class="inline country" title="<%= relay.get('countryname') %>" src="img/cc/<%= relay.get('country') %>.png"/> <% } %> </td> - <td><%= relay.get('or_addresses') %></td> + <td><%= relay.get('or_address') %></td> <td> <% _.each(relay.get('flags'), function(flag) { %> <img class="inline flags" rel="tooltip" src="img/flags/<%= flag[1] %>.png" title="<%= flag[0] %>"/>

1 0

[atlas/master] Indicate on y axis whether values are B/s, KB/s, or MB/s.
by karsten＠torproject.org 20 Aug '12

20 Aug '12

commit bc7a69e92eeedbbd97314c2a01ea5d61bc5da02c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 9 18:43:10 2012 +0200 Indicate on y axis whether values are B/s, KB/s, or MB/s. Implements #5388. --- js/views/details/main.js | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/js/views/details/main.js b/js/views/details/main.js index 8b02421..64698c7 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -57,6 +57,14 @@ define([ }, grid: { hoverable: true, clickable: true }, xaxis: {mode: 'time', tickLength: 5}, + yaxis: {tickFormatter : function suffixFormatter(val, axis) { + if (val > 1000000) + return (val / 1000000).toFixed(axis.tickDecimals) + " MB/s"; + else if (val > 1000) + return (val / 1000).toFixed(axis.tickDecimals) + " KB/s"; + else + return val.toFixed(axis.tickDecimals) + " B/s"; + }}, }); $("#"+g).resize();

1 0

[atlas/master] Merge branch 'task-5388'
by karsten＠torproject.org 20 Aug '12

20 Aug '12

commit cdc21cb47419455c07e9f76ef57488b8a8a3e6de Merge: 68f2ec8 bc7a69e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 09:27:44 2012 +0200 Merge branch 'task-5388' js/models/relay.js | 3 +++ js/views/details/main.js | 8 ++++++++ templates/search/do.html | 2 +- 3 files changed, 12 insertions(+), 1 deletions(-)

1 0

r25760: {website} Remove getinvolved/research which has moved to research.torp (website/trunk/getinvolved/en)
by Karsten Loesing 20 Aug '12

20 Aug '12

Author: kloesing Date: 2012-08-20 07:23:26 +0000 (Mon, 20 Aug 2012) New Revision: 25760 Removed: website/trunk/getinvolved/en/research.wml Modified: website/trunk/getinvolved/en/sidenav.wmi Log: Remove getinvolved/research which has moved to research.torproject.org Deleted: website/trunk/getinvolved/en/research.wml =================================================================== --- website/trunk/getinvolved/en/research.wml 2012-08-20 06:12:23 UTC (rev 25759) +++ website/trunk/getinvolved/en/research.wml 2012-08-20 07:23:26 UTC (rev 25760) @@ -1,226 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 4-optional - -#include "head.wmi" TITLE="Tor: Research" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page getinvolved/research>">Research</a> - </div> - <div id="maincol"> -  -<h2>Tor: Research</h2> -<hr /> - -<p> -Many people around the world are doing research on how to improve the Tor -design, what's going on in the Tor network, and more generally on attacks -and defenses for anonymous communication systems. This page summarizes -the resources we provide to help make your Tor research more effective. -The best way to reach us about research is through the <a href="<page -about/contact>">tor-assistants</a> list. -</p> - -<ul> - -<li> -<b>Data.</b> -We've been <a href="https://metrics.torproject.org/data.html">collecting -data to learn more about the Tor network</a>: how many relays and -clients there are in the network, what capabilities they have, how -fast the network is, how many clients are connecting via bridges, -what traffic exits the network, etc. We are also developing -tools to process these huge data archives and come up with -<a href="https://metrics.torproject.org/graphs.html">useful -statistics</a>. Let us know what other information you'd like to -see, and we can work with you to help make sure it gets collected -<a href="https://metrics.torproject.org/papers/wecsr10.pdf">safely</a> -and robustly. -</li> - -<li> -<b>Analysis.</b> -If you're investigating Tor, or solving a Tor-related problem, -<i>_please_</i> talk to us somewhere along the way — the earlier -the better. These days we review too many conference paper submissions -that make bad assumptions and end up solving the wrong problem. Since -the Tor protocol and the Tor network are both moving targets, measuring -things without understanding what's going on behind the scenes is going -to result in bad conclusions. In particular, different groups often -unwittingly run a variety of experiments in parallel, and at the same -time we're constantly modifying the design to try new approaches. If -you let us know what you're doing and what you're trying to learn, -we can help you understand what other variables to expect and how to -interpret your results. -</li> - -<li> -<b>Measurement and attack tools.</b> -We're building a <a -href="https://metrics.torproject.org/tools.html">repository</a> of tools -that can be used to measure, analyze, or perform attacks on Tor. Many -research groups end up needing to do similar measurements (for example, -change the Tor design in some way and then see if latency improves), -and we hope to help everybody standardize on a few tools and then make -them really good. Also, while there are some really neat Tor attacks -that people have published about, it's hard to track down a copy of -the code they used. Let us know if you have new tools we should list, -or improvements to the existing ones. The more the better, at this stage. -</li> - -<li> -<b>We need defenses too — not just attacks.</b> -Most researchers find it easy and fun to come up with novel attacks on -anonymity systems. We've seen this result lately in terms of improved -congestion attacks, attacks based on remotely measuring latency or -throughput, and so on. Knowing how things can go wrong is important, -and we recognize that the incentives in academia aren't aligned with -spending energy on designing defenses, but it sure would be great to -get more attention to how to address the attacks. We'd love to help -brainstorm about how to make Tor better. As a bonus, your paper might -even end up with a stronger "countermeasures" section. -</li> - -<li> -<b>In-person help.</b> -If you're doing interesting and important Tor research and need help -understanding how the Tor network or design works, interpreting your -data, crafting your experiments, etc, we can send a Tor researcher to -your doorstep. As you might expect, we don't have a lot of free time; -but making sure that research is done in a way that's useful to us is -really important. So let us know, and we'll work something out. -</li> - -</ul> - -<a id="Groups"></a> -<h2><a class="anchor" href="#Groups">Research Groups</a></h2> - -<p>Interested to find other anonymity researchers? Here are some -research groups you should take a look at.</p> - -<ul> -<li>Ian Goldberg's <a href="http://crysp.uwaterloo.ca/">CrySP</a> group -at Waterloo. -</li> -<li><a href="http://www-users.cs.umn.edu/~hopper/">Nick Hopper</a>'s -group at UMN. -</li> -<li><a href="http://www.hatswitch.org/~nikita/">Nikita Borisov</a>'s -group at Illinois. -</li> -<li>Micah Sherr's <a href="https://security.cs.georgetown.edu/">SecLab</a> -group at Georgetown. -</li> -<li>Matt Wright's <a href="http://isec.uta.edu/">iSec</a> group at -UTA. -</li> -</ul> - -<a id="Ideas"></a> -<h2><a class="anchor" href="#Ideas">Research Ideas</a></h2> - -<p> -If you're interested in anonymity research, you must make it to the -<a href="http://petsymposium.org/">Privacy Enhancing Technologies -Symposium</a>. Everybody who's anybody in the anonymity research world -will be there. Stipends are generally available for people whose presence -will benefit the community. -</p> - -<p>To get up to speed on anonymity research, read <a -href="http://freehaven.net/anonbib/">these papers</a> (especially the -ones in boxes).</p> - -<p>We need people to attack the system, quantify defenses, -etc. Here are some example projects:</p> - -<ul> - -<li>What algorithm should we use to assign Guard flags such that a) -we assign the flag to as many relays as possible, yet b) we minimize -the chance that Alice will use an attacker's node as a guard? See the -<a href="<blog>/research-problem-better-guard-rotation-parameters">blog -post</a> for details. -</li> - -<li>For various diversity metrics, how has the diversity of -the Tor network changed over time? How robust is it to change or -attack? These results can help us make better design decisions. See the <a -href="<blog>/research-problem-measuring-safety-tor-network">blog post</a> -for details. -</li> - -<li>If we prevent the really loud users from using too much of the Tor -network, how much can it help? We've instrumented Tor's entry relays -so they can rate-limit connections from users, and we've instrumented -the directory authorities so they can change the rate-limiting -parameters globally across the network. Which parameter values improve -performance for the Tor network as a whole? How should relays adapt -their rate-limiting parameters based on their capacity and based on -the network load they see, and what rate-limiting algorithms will work -best? See the <a -href="<blog>/research-problem-adaptive-throttling-tor-clients-entry-guards">blog -post</a> for details. -</li> - -<li>Right now Tor clients are willing to reuse a given circuit for ten -minutes after it's first used. The goal is to avoid loading down the -network with too many circuit creations, yet to also avoid having -clients use the same circuit for so long that the exit node can build a -useful pseudonymous profile of them. Alas, ten minutes is probably way -too long, especially if connections from multiple protocols (e.g. IM and -web browsing) are put on the same circuit. If we keep fixed the overall -number of circuit extends that the network needs to do, are there more -efficient and/or safer ways for clients to allocate streams to circuits, -or for clients to build preemptive circuits? Perhaps this research item -needs to start with gathering some traces of what requests typical -clients try to launch, so you have something realistic to try to optimize. -</li> - -<li>The "website fingerprinting attack": make a list of a few -hundred popular websites, download their pages, and make a set of -"signatures" for each site. Then observe a Tor client's traffic. As -you watch him receive data, you quickly approach a guess about which -(if any) of those sites he is visiting. First, how effective is -this attack on the deployed Tor design? The problem with all the -previous attack papers is that they look at timing and counting of -IP packets on the wire. But OpenSSL's TLS records, plus Tor's use of -TCP pushback to do rate limiting, means that tracing by IP packets -produces very poor results. The right approach is to realize that -Tor uses OpenSSL, look inside the TLS record at the TLS headers, and -figure out how many 512-byte cells are being sent or received. Then -start exploring defenses: for example, we could change Tor's cell -size from 512 bytes to 1024 bytes, we could employ padding techniques -like <a href="http://freehaven.net/anonbib/#timing-fc2004">defensive -dropping</a>, or we could add traffic delays. How much of an impact do -these have, and how much usability impact (using some suitable metric) -is there from a successful defense in each case?</li> - - - -<li>More coming soon. See also the "Research" section of the <a -href="<page getinvolved/volunteer>#Research">volunteer</a> page for -other topics. -</li> - -</ul> - - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi> - Modified: website/trunk/getinvolved/en/sidenav.wmi =================================================================== --- website/trunk/getinvolved/en/sidenav.wmi 2012-08-20 06:12:23 UTC (rev 25759) +++ website/trunk/getinvolved/en/sidenav.wmi 2012-08-20 07:23:26 UTC (rev 25760) @@ -25,7 +25,7 @@ {'url' => 'getinvolved/relays', 'txt' => 'Set up relays', }, - {'url' => 'getinvolved/research', + {'url' => 'https://research.torproject.org/', 'txt' => 'Research', }, {'url' => 'donate/donate',

1 0