[tor-commits] [stem/master] More clearly stating tutorial topics

2013-03-11 Thread atagar
commit 7d13f767c08e35d55324186832deb7c6df6de62d Author: Damian Johnson ata...@torproject.org Date: Sun Mar 10 22:59:23 2013 -0700 More clearly stating tutorial topics While our cutesy titles are fun, they shouldn't get in the way of our tutorial page making sense. Dropping

[tor-commits] [stem/master] Making all labels links

2013-03-11 Thread atagar
commit 74b80d61fe3279ca006ecae86271557523e33967 Author: Damian Johnson ata...@torproject.org Date: Sun Mar 10 23:07:48 2013 -0700 Making all labels links Among the tutorials the labels (ie. the text summary for a section) was a link but on the download and example pages they

[tor-commits] [tor/release-0.2.4] fold in changes entries so far

2013-03-11 Thread arma
commit 53e11977e46080db7d07f9f95568efe089504ff4 Author: Roger Dingledine a...@torproject.org Date: Mon Mar 11 04:38:32 2013 -0400 fold in changes entries so far --- ChangeLog | 145 + changes/6783_big_hammer |6 --

[tor-commits] [tor/release-0.2.4] bump to 0.2.4.11-alpha

2013-03-11 Thread arma
commit f0a5f91b1388b1319fa76aa329f0d19f441ff117 Author: Roger Dingledine a...@torproject.org Date: Mon Mar 11 04:41:52 2013 -0400 bump to 0.2.4.11-alpha --- configure.ac |2 +- contrib/tor-mingw.nsi.in |2 +- src/win32/orconfig.h |2 +- 3 files changed, 3

[tor-commits] [stem/master] Pluralizing the tutorials page

2013-03-11 Thread atagar
commit 48938b1d95d25ef255c19cfdd7a8a30714a80b76 Author: Damian Johnson ata...@torproject.org Date: Mon Mar 11 00:22:43 2013 -0700 Pluralizing the tutorials page Renaming the 'tutorial' page to 'tutorials'. I can't remove the old page yet since I just sent it to tor-dev@, but now

[tor-commits] [compass/master] Change the default value of top to 10

2013-03-11 Thread karsten
commit 53fde1f8aa6369cb80a0be71ccf02d33094f14c5 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Mon Mar 11 15:34:42 2013 +0530 Change the default value of top to 10 --- templates/index.html |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git

[tor-commits] [atlas/master] Add relay nickname to title.

2013-03-11 Thread karsten
commit a189eb5a61701043e8bed4c73ca498c28320f85d Author: Karsten Loesing karsten.loes...@gmx.net Date: Mon Mar 11 15:10:58 2013 +0100 Add relay nickname to title. Implements #5833. --- js/views/about/main.js |1 + js/views/details/main.js |1 + js/views/search/do.js|

[tor-commits] [tor/maint-0.2.3] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

2013-03-11 Thread nickm
commit c6ca199888102a825f004f8613331f97525da486 Merge: 5e0ce4c 3dde6d5 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 13:32:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-mar2013 |3 + src/config/geoip |92875

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2013-03-11 Thread nickm
commit ef4db3169344567f30fb72e3e9a66154b976d889 Merge: 0196647 c6ca199 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 13:32:16 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-mar2013 |3 + src/config/geoip |92875

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

2013-03-11 Thread nickm
commit c6ca199888102a825f004f8613331f97525da486 Merge: 5e0ce4c 3dde6d5 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 13:32:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-mar2013 |3 + src/config/geoip |92875

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2013-03-11 Thread nickm
commit ef4db3169344567f30fb72e3e9a66154b976d889 Merge: 0196647 c6ca199 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 13:32:16 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-mar2013 |3 + src/config/geoip |92875

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

2013-03-11 Thread nickm
commit c6ca199888102a825f004f8613331f97525da486 Merge: 5e0ce4c 3dde6d5 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 13:32:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-mar2013 |3 + src/config/geoip |92875

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

2013-03-11 Thread nickm
commit 2a02efb601e287722159c6754a1b20085faebd93 Merge: 331e4dc ef4db31 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 13:32:35 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/geoip-mar2013 |3 + src/config/geoip |92875

[tor-commits] [tor/master] Manually fix yet another fourteen 'A1' ranges.

2013-03-11 Thread nickm
commit 5cad78c2ce0c28a79eb19eb5e5c77741ff2dbf55 Author: Karsten Loesing karsten.loes...@gmx.net Date: Thu Mar 7 20:55:46 2013 +0100 Manually fix yet another fourteen 'A1' ranges. MaxMind added fourteen new 'A1' ranges in their March 2013 database that the automatic substitution

[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013'

2013-03-11 Thread nickm
commit d89b8e075116ae28e1a168d8fecc9a901a736a17 Merge: 2a02efb 5cad78c Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 13:34:32 2013 -0400 Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013' src/config/geoip-manual | 76

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

2013-03-11 Thread arma
commit ef4db3169344567f30fb72e3e9a66154b976d889 Merge: 0196647 c6ca199 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 13:32:16 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-mar2013 |3 + src/config/geoip |92875

[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

2013-03-11 Thread arma
commit c6ca199888102a825f004f8613331f97525da486 Merge: 5e0ce4c 3dde6d5 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 13:32:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-mar2013 |3 + src/config/geoip |92875

[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

2013-03-11 Thread arma
commit 790ddd6e0af1be48dc842a28c1599a6027f85b30 Merge: f0a5f91 ef4db31 Author: Roger Dingledine a...@torproject.org Date: Mon Mar 11 14:02:26 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-mar2013 |3 + src/config/geoip |92875

[tor-commits] [tor/release-0.2.4] fold in changes entry

2013-03-11 Thread arma
commit fcd9248387249d68619734a73860ffaab12b021b Author: Roger Dingledine a...@torproject.org Date: Mon Mar 11 14:03:06 2013 -0400 fold in changes entry --- ChangeLog |2 +- changes/geoip-mar2013 |3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git

[tor-commits] [torspec/master] Document MEASURE_TIMEOUT; bug 7626.

2013-03-11 Thread nickm
commit b00456b35d0c6ded192f6c90a49a53ccc332bcf0 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 14:07:14 2013 -0400 Document MEASURE_TIMEOUT; bug 7626. --- control-spec.txt |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/control-spec.txt

[tor-commits] [torspec/master] Clarify GETINFO response formatting for #6172

2013-03-11 Thread nickm
commit 459b3c93b2041bca718b6ce7fdaf5cb5864f5cc3 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 14:15:01 2013 -0400 Clarify GETINFO response formatting for #6172 --- control-spec.txt |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git

[tor-commits] [ooni-probe/master] Refactor setup.py script

2013-03-11 Thread isis
commit 957f20d5c3a590bf2c9db3f15dcbc6c0daa1be73 Author: Arturo Filastò a...@fuffa.org Date: Fri Dec 7 01:53:16 2012 +0100 Refactor setup.py script (cherry picked from commit a3b8bb52711537e1db8770bf447230f812b68166) --- setup.py | 44 1

[tor-commits] [ooni-probe/master] Txscapy is now in pypi, no need to have it mirrored on tpo

2013-03-11 Thread isis
commit 1d93ef03802485da67848cbab918b1edc01669df Author: Arturo Filastò a...@fuffa.org Date: Wed Feb 27 15:58:29 2013 +0100 Txscapy is now in pypi, no need to have it mirrored on tpo (cherry picked from commit e74ea0cbd7816bda547dced875523253ca6d312a) Conflicts:

[tor-commits] [ooni-probe/master] Txscapy is now in pypi, no need to have it mirrored on tpo

2013-03-11 Thread isis
commit 160b10d8bfcba159524b53ce292d8ac3d9d0e867 Author: Arturo Filastò a...@fuffa.org Date: Wed Feb 27 15:58:29 2013 +0100 Txscapy is now in pypi, no need to have it mirrored on tpo (cherry picked from commit e74ea0cbd7816bda547dced875523253ca6d312a) Conflicts:

[tor-commits] [ooni-probe/master] Merge remote-tracking branch 'gh-common/master'

2013-03-11 Thread isis
commit 946a321a0a120697ca5fb42f4c6972361fa2afaa Merge: 4bd8e05 5ca95ac Author: Isis Lovecruft i...@torproject.org Date: Mon Mar 11 19:04:56 2013 + Merge remote-tracking branch 'gh-common/master' requirements.txt |5 +--- setup.py | 55

[tor-commits] [ooni-probe/master] Update setup.py script and test that it works.

2013-03-11 Thread isis
commit b96b8a60f92fb6b64b028b14484286a4a5829717 Author: Arturo Filastò a...@fuffa.org Date: Wed Feb 27 15:59:01 2013 +0100 Update setup.py script and test that it works. (cherry picked from commit 7a55afa0399d2338f6ac5b8e2232e3645d694c06) --- setup.py | 27

[tor-commits] [ooni-probe/master] Merge pull request #56 from hellais/feature/setup.py

2013-03-11 Thread isis
commit 5ca95ace243f8baa1f2f3203c1be605ae82686a0 Merge: 4bd8e05 b96b8a6 Author: Isis Agora Lovecruft i...@torproject.org Date: Mon Mar 11 12:04:02 2013 -0700 Merge pull request #56 from hellais/feature/setup.py Feature/setup.py requirements.txt |5 +--- setup.py | 55

[tor-commits] [tor/maint-0.2.4] Look at the right variable when warning about signed size_t.

2013-03-11 Thread nickm
commit 051b1e8ac4114fb23904cdf8dead72d585904e0a Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 16:29:06 2013 -0400 Look at the right variable when warning about signed size_t. In 81d69f4c2d8a451 (0.2.21-alpha) we added a compile-time check for a (totally broken)

[tor-commits] [torspec/master] Correct when authorities assign the HSDir flag

2013-03-11 Thread nickm
commit 5bab273834577728f3df930cc33a914454b5b215 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 11 17:39:10 2013 -0400 Correct when authorities assign the HSDir flag Fixes 8242. --- dir-spec.txt |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git

[tor-commits] r26103: {website} 0.2.4.11-alpha tarball is up (in website/trunk: . include)

2013-03-11 Thread Roger Dingledine
Author: arma Date: 2013-03-11 21:41:58 + (Mon, 11 Mar 2013) New Revision: 26103 Modified: website/trunk/Makefile website/trunk/include/versions.wmi Log: 0.2.4.11-alpha tarball is up Modified: website/trunk/Makefile ===

[tor-commits] [ooni-probe/master] Test for raw socket permission

2013-03-11 Thread isis
commit 5eb60817a2ed1771adf2a11ba3fe4041ed5a3df8 Author: aagbsn aag...@extc.org Date: Mon Feb 18 02:23:11 2013 +0100 Test for raw socket permission --- ooni/utils/txscapy.py |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ooni/utils/txscapy.py

[tor-commits] [ooni-probe/master] Don't ask for root if we have the power

2013-03-11 Thread isis
commit d707f5ab5b9c4abe129430297459d28477880d7a Author: aagbsn aag...@extc.org Date: Mon Feb 18 02:23:49 2013 +0100 Don't ask for root if we have the power --- ooni/templates/scapyt.py |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ooni/templates/scapyt.py

[tor-commits] [ooni-probe/master] Update README.md with setcap instructions

2013-03-11 Thread isis
commit 7823c2baf22dc0c88fc3c31e8336b76a3ea21b07 Author: aagbsn aag...@extc.org Date: Mon Feb 18 02:33:20 2013 +0100 Update README.md with setcap instructions --- README.md |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/README.md b/README.md index

[tor-commits] [ooni-probe/master] Merge pull request #41 from aagbsn/check_raw_socket

2013-03-11 Thread isis
commit 325e0f26a704b87ec731451f9a1d570c5c169b0d Merge: 946a321 7823c2b Author: Isis Agora Lovecruft i...@torproject.org Date: Mon Mar 11 17:29:03 2013 -0700 Merge pull request #41 from aagbsn/check_raw_socket Check raw socket README.md|4

[tor-commits] [stem/master] More changes for tutorial rename

2013-03-11 Thread atagar
commit 2c9710060e6194e30d6971377ddc80fa681eeaa9 Author: Damian Johnson ata...@torproject.org Date: Mon Mar 11 18:07:54 2013 -0700 More changes for tutorial rename Drats, I pushed the prior commit before I had intended to. Fixing the buttons too to reflect the rename. ---

[tor-commits] [stem/master] Dropping 'aka' from tutorial labels

2013-03-11 Thread atagar
commit 98f878087dfb5eeac3fd2720b47b4ffe1fe1bc75 Author: Damian Johnson ata...@torproject.org Date: Mon Mar 11 18:28:24 2013 -0700 Dropping 'aka' from tutorial labels The labels look a little nicer this way. Suggested by Josh Barr. --- .../label/double_double_toil_and_trouble.png

[tor-commits] [stem/master] Filling in a description for MEASURE_TIMEOUT

2013-03-11 Thread atagar
commit fb35fc7a9dd9d0217bedbc38bda51f58579d5f77 Author: Damian Johnson ata...@torproject.org Date: Mon Mar 11 19:01:16 2013 -0700 Filling in a description for MEASURE_TIMEOUT Nick added a description to address... https://trac.torproject.org/7626 I'm not quite

[tor-commits] r26104: {website} TBB Design Doc: Mention use of SPDY at exits. This is an ext (website/trunk/projects/torbrowser/design)

2013-03-11 Thread Mike Perry
Author: mikeperry Date: 2013-03-12 02:20:25 + (Tue, 12 Mar 2013) New Revision: 26104 Modified: website/trunk/projects/torbrowser/design/index.html.en Log: TBB Design Doc: Mention use of SPDY at exits. This is an extremely important point with the pipelining/SPDY defense. We don't have to

[tor-commits] [ooni-probe/master] Merge branch 'master' into develop

2013-03-11 Thread isis
commit be359f9b3ef27882d2977a0f0a16e9fb150a3bf8 Merge: 4bd8e05 946a321 Author: Isis Lovecruft i...@torproject.org Date: Mon Mar 11 19:18:55 2013 + Merge branch 'master' into develop requirements.txt |5 +--- setup.py | 55

[tor-commits] [ooni-probe/master] Add --use-mirrors to the TravisCI install command, as is recommended.

2013-03-11 Thread isis
commit d0c26b71b78a3285df8db82aabfb67dcd806d750 Author: Isis Lovecruft i...@torproject.org Date: Sun Mar 10 08:21:02 2013 + Add --use-mirrors to the TravisCI install command, as is recommended. --- .travis.yml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git

[tor-commits] [ooni-probe/master] Add yaml file for controlling the continuous integration service.

2013-03-11 Thread isis
commit 690f8e3c5322519ca28c1e63d717983db87dd95a Author: Isis Lovecruft i...@torproject.org Date: Sun Mar 10 08:07:56 2013 + Add yaml file for controlling the continuous integration service. * This is currently hooked to my personal repo, for testing purposes, before we

[tor-commits] [ooni-probe/master] Oops. 'make' should be run from the ./inputs/ directory, it's not a script. Duh.

2013-03-11 Thread isis
commit d5c8b02d10689666deb4c3628fe4fef8ccb28b0f Author: Isis Lovecruft i...@torproject.org Date: Mon Mar 11 18:52:07 2013 + Oops. 'make' should be run from the ./inputs/ directory, it's not a script. Duh. --- .travis.yml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

[tor-commits] [ooni-probe/master] Update .travis.yml to copy the ooniprobe.conf.sample to ooniprobe.conf.

2013-03-11 Thread isis
commit 133045efef1666e4fafd3b587b645123020b2651 Author: Isis Lovecruft i...@torproject.org Date: Mon Mar 11 20:14:10 2013 + Update .travis.yml to copy the ooniprobe.conf.sample to ooniprobe.conf. * Fixes #8450. --- .travis.yml |2 +- 1 files changed, 1 insertions(+), 1

[tor-commits] [ooni-probe/master] Use example_inputs in .travis.yml rather than ooni_inputs.

2013-03-11 Thread isis
commit 6b5e52973a7b56438bcc94794d794d32410190f1 Author: Isis Lovecruft i...@torproject.org Date: Mon Mar 11 20:22:28 2013 + Use example_inputs in .travis.yml rather than ooni_inputs. * Fixes #8451 travis-lint checks out properly:

[tor-commits] [ooni-probe/master] Merge pull request #67 from isislovecruft/feature/continuous-integration

2013-03-11 Thread isis
commit 46f955f0847b20511a438747c9f65d56acd3b611 Merge: 325e0f2 d6e8b08 Author: aagbsn aag...@extc.org Date: Mon Mar 11 19:22:30 2013 -0700 Merge pull request #67 from isislovecruft/feature/continuous-integration Feature/continuous integration .travis.yml | 19

[tor-commits] [ooni-probe/master] Update .travis.yml to put the install commands under the install section.

2013-03-11 Thread isis
commit d6e8b08ce07a0664c2bbf55a2b40d47ea02cc795 Author: Isis Lovecruft i...@torproject.org Date: Mon Mar 11 21:00:38 2013 + Update .travis.yml to put the install commands under the install section. * Separate commands for testing pip and setuptools installations. * TODO I

[tor-commits] [ooni-probe/master] Add travis-ci build script.

2013-03-11 Thread isis
commit 06d552c1c50974e17d58e91b173385653a7e2f9c Author: Arturo Filastò a...@fuffa.org Date: Mon Mar 11 21:13:11 2013 +0100 Add travis-ci build script. (cherry picked from commit cfe357a546669c3ca70ee1f65dbc5034c2be4760) --- .travis.yml | 10 +- 1 files changed, 9