[tor-commits] [torbrowser/maint-2.2] bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere

2012-08-27 Thread erinn
commit 2c75280860ead77ce2969d8179ec34087382d545 Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:13:27 2012 +0100 bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere --- README.LINUX-2.2 |8 README.OSX-2.2|

[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

2012-08-27 Thread erinn
commit 18d1057df5a2e539d9d48552da3cad4962b5959e Merge: 0aafb37 2c75280 Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:13:55 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |8 README.OSX-2.2|8 README.WIN-2.2

[tor-commits] [torbrowser/maint-2.3] bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere

2012-08-27 Thread erinn
commit 2c75280860ead77ce2969d8179ec34087382d545 Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:13:27 2012 +0100 bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere --- README.LINUX-2.2 |8 README.OSX-2.2|

[tor-commits] [torbrowser/master] bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere

2012-08-27 Thread erinn
commit 2c75280860ead77ce2969d8179ec34087382d545 Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:13:27 2012 +0100 bump stable tbbs to 2.2.38-2 for new firefox, libevent, noscript, and https-everywhere --- README.LINUX-2.2 |8 README.OSX-2.2|

[tor-commits] [torbrowser/master] Merge branch 'maint-2.2' into maint-2.3

2012-08-27 Thread erinn
commit 18d1057df5a2e539d9d48552da3cad4962b5959e Merge: 0aafb37 2c75280 Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:13:55 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 |8 README.OSX-2.2|8 README.WIN-2.2

[tor-commits] [torbrowser/master] Merge branch 'maint-2.3'

2012-08-27 Thread erinn
commit 31c0e3c93b2d8b003ab30bb90c69c2f01e97f29a Merge: a1b4049 18d1057 Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:14:01 2012 +0100 Merge branch 'maint-2.3' README.LINUX-2.2 |8 README.OSX-2.2|8 README.WIN-2.2|

[tor-commits] [torbrowser/maint-2.3] Linux: bump library names for libevent update

2012-08-27 Thread erinn
commit b88ec22d0627b680c97da93706d12f63684f79dc Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:28:46 2012 +0100 Linux: bump library names for libevent update --- build-scripts/linux.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

2012-08-27 Thread erinn
commit f764ddd2ceb8dc99a10afb27eeec65dd7a2bab91 Merge: 18d1057 b88ec22 Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:29:04 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [torbrowser/master] Linux: bump library names for libevent update

2012-08-27 Thread erinn
commit b88ec22d0627b680c97da93706d12f63684f79dc Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:28:46 2012 +0100 Linux: bump library names for libevent update --- build-scripts/linux.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git

[tor-commits] [torbrowser/master] Merge branch 'maint-2.2' into maint-2.3

2012-08-27 Thread erinn
commit f764ddd2ceb8dc99a10afb27eeec65dd7a2bab91 Merge: 18d1057 b88ec22 Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:29:04 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [torbrowser/master] Merge branch 'maint-2.3'

2012-08-27 Thread erinn
commit 3356ab5dca3fc20981ad114e642a1bb61e535b92 Merge: 31c0e3c f764ddd Author: Erinn Clark er...@torproject.org Date: Mon Aug 27 07:29:09 2012 +0100 Merge branch 'maint-2.3' build-scripts/linux.mk |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

2012-08-27 Thread translation
commit 383cbdaeaac9ba5ed7e973bddad8678effb3237b Author: Translation commit bot translat...@torproject.org Date: Mon Aug 27 12:45:18 2012 + Update translations for vidalia_help --- cs/netview.po | 22 +++--- 1 files changed, 11 insertions(+), 11 deletions(-) diff

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

2012-08-27 Thread translation
commit c261199b276a87ee4b91d67fc2e7f23dc2eca807 Author: Translation commit bot translat...@torproject.org Date: Mon Aug 27 13:15:18 2012 + Update translations for vidalia_help --- cs/netview.po | 26 +- 1 files changed, 13 insertions(+), 13 deletions(-) diff

[tor-commits] [translation/vidalia_help_completed] Update translations for vidalia_help_completed

2012-08-27 Thread translation
commit a9988e30a4a4c2aea317c3eec4247910690819d4 Author: Translation commit bot translat...@torproject.org Date: Mon Aug 27 13:15:22 2012 + Update translations for vidalia_help_completed --- cs/netview.po | 248 + 1 files changed,

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

2012-08-27 Thread translation
commit 530907db5fc777f9dc9b6cee02d2f413c5cc68c5 Author: Translation commit bot translat...@torproject.org Date: Mon Aug 27 13:45:20 2012 + Update translations for vidalia_help --- cs/server.po | 23 +++ 1 files changed, 11 insertions(+), 12 deletions(-) diff

[tor-commits] [tor/master] Make all relays, not only bridges, capable of advertising an IPv6 OR port.

2012-08-27 Thread nickm
commit 5671586dc75eb282ae8d2d04f0fcb5e1e5064c9f Author: Linus Nordberg li...@torproject.org Date: Tue Aug 14 14:03:58 2012 +0200 Make all relays, not only bridges, capable of advertising an IPv6 OR port. Closes #6362. --- changes/bug6362 |3 +++ src/or/router.c |6 --

[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug6362'

2012-08-27 Thread nickm
commit 6f7dbd3d34fbc476721a64c7c5f5e241ec49b906 Merge: 6864a44 5671586 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 09:50:22 2012 -0400 Merge remote-tracking branch 'linus/bug6362' changes/bug6362 |3 +++ src/or/router.c |6 -- 2 files changed, 7 insertions(+),

[tor-commits] [tor/master] Send IPv6 address in NETINFO cells.

2012-08-27 Thread nickm
commit 9216e2819b563d3e519b131a7ec34b3ddc196e25 Author: Linus Nordberg li...@torproject.org Date: Tue Aug 14 14:03:58 2012 +0200 Send IPv6 address in NETINFO cells. Closes #6364. --- changes/bug6364|3 +++ src/or/connection_or.c |9 - 2 files changed, 11

[tor-commits] [tor/master] Fetch IPv6 address from NETINFO other OR's address field.

2012-08-27 Thread nickm
commit 734b09080f31545e8acd57a5c9626f6465ea4374 Author: Linus Nordberg li...@torproject.org Date: Tue Aug 21 18:43:36 2012 +0200 Fetch IPv6 address from NETINFO other OR's address field. The my_apparent_addr is still unused, apart from now being logged in the Got good NETINFO

[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug6364'

2012-08-27 Thread nickm
commit b3b4f319367e1fb50ea99ba042ed60030e909c12 Merge: 6f7dbd3 734b090 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 09:53:37 2012 -0400 Merge remote-tracking branch 'linus/bug6364' changes/bug6364|3 +++ src/or/command.c | 14 +-

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

2012-08-27 Thread translation
commit 557c07c19c2026341bcfe3003b4454a56f160e69 Author: Translation commit bot translat...@torproject.org Date: Mon Aug 27 14:15:19 2012 + Update translations for vidalia_help --- cs/server.po | 16 1 files changed, 8 insertions(+), 8 deletions(-) diff --git

[tor-commits] [tor/master] Move to non-recursive make

2012-08-27 Thread nickm
commit 2a4a1496241d6c4183763f90600be4775ccb5470 Author: Stewart Smith stew...@flamingspork.com Date: Thu Aug 2 23:31:43 2012 +1000 Move to non-recursive make This gives us a few benefits: 1) make -j clean all this will start working, as it should. It currently doesn't.

[tor-commits] [tor/master] add subdir-objects to AUTOMAKE_OPTIONS, this builds object files in subdirs with non-recursive make

2012-08-27 Thread nickm
commit e612179e09d88b4b1da3c2d046a19c8652e279a1 Author: Stewart Smith stew...@flamingspork.com Date: Fri Aug 3 00:19:58 2012 +1000 add subdir-objects to AUTOMAKE_OPTIONS, this builds object files in subdirs with non-recursive make --- Makefile.am |2 +- 1 files changed, 1

[tor-commits] [tor/master] remove contrib/Makefile and contrib/suse/Makefile from configure.in

2012-08-27 Thread nickm
commit 12aa553349ed7e630fcec9a60dfde7137e1684de Author: Stewart Smith stew...@flamingspork.com Date: Fri Aug 3 08:59:32 2012 +1000 remove contrib/Makefile and contrib/suse/Makefile from configure.in (otherwise would throw an error of required file X not found as part of

[tor-commits] [tor/master] fix dependencies for some generated files

2012-08-27 Thread nickm
commit 7bb04f111a6ba97dca627c1a76a05a58a42a7c21 Author: Stewart Smith stew...@flamingspork.com Date: Fri Aug 3 09:04:48 2012 +1000 fix dependencies for some generated files --- src/common/include.am |6 +++--- src/or/include.am |4 ++-- 2 files changed, 5 insertions(+), 5

[tor-commits] [tor/master] fix TESTS to include full path to src/test/test

2012-08-27 Thread nickm
commit 8f466a1c606221e1391816296b20d9c54196ebbd Author: Stewart Smith stew...@flamingspork.com Date: Fri Aug 3 09:05:18 2012 +1000 fix TESTS to include full path to src/test/test --- src/test/include.am |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git

[tor-commits] [tor/master] fix circular dependency for generating code digests

2012-08-27 Thread nickm
commit 2e80ae895dbec1e2922aef584bafa0ddad728a14 Author: Stewart Smith stew...@flamingspork.com Date: Fri Aug 3 09:07:27 2012 +1000 fix circular dependency for generating code digests --- src/or/include.am |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git

[tor-commits] [tor/master] Fix up make distcheck and greatly simplify docs dependencies (although it's still a bit odd)

2012-08-27 Thread nickm
commit 2606c8b289eb654c6b0cec8d3f25c72b426eab2b Author: Stewart Smith stew...@flamingspork.com Date: Fri Aug 3 11:20:52 2012 +1000 Fix up make distcheck and greatly simplify docs dependencies (although it's still a bit odd) --- doc/include.am| 42

[tor-commits] [tor/master] fix up calling of config.status to generate docs

2012-08-27 Thread nickm
commit 301e24e4a85bfa0ff2dfb73f338c9b543c1e1b6c Author: Stewart Smith stew...@flamingspork.com Date: Fri Aug 3 11:26:21 2012 +1000 fix up calling of config.status to generate docs --- doc/include.am |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/include.am

[tor-commits] [tor/master] Replace man_MANS with nodist_man1_MANS

2012-08-27 Thread nickm
commit 8f60f70e213376f329e49ae46b4bb1b82f350aba Author: Jim Meyering meyer...@redhat.com Date: Thu Aug 23 12:36:31 2012 -0400 Replace man_MANS with nodist_man1_MANS (commit message by nickm) --- doc/include.am |8 1 files changed, 4 insertions(+), 4 deletions(-) diff

[tor-commits] [tor/master] s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/

2012-08-27 Thread nickm
commit 0df149ff6e1ac86d23282a8904851f8897d68cec Author: Jim Meyering meyer...@redhat.com Date: Thu Aug 23 12:35:21 2012 -0400 s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/ Apparently the former will stop working with newer auto* (commit message by nickm) --- configure.in |3

[tor-commits] [tor/master] Make the _sha1.i file generation quieter

2012-08-27 Thread nickm
commit 6d703f8db5d5a506f82f40a638560749755ddc6e Author: Nick Mathewson ni...@torproject.org Date: Thu Aug 23 13:14:41 2012 -0400 Make the _sha1.i file generation quieter --- src/common/include.am |2 +- src/or/include.am |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Add missing dependency so the html.in files get built

2012-08-27 Thread nickm
commit 3f493535477e7dea25407522ce4f0d74c21a Author: Nick Mathewson ni...@torproject.org Date: Thu Aug 23 12:52:33 2012 -0400 Add missing dependency so the html.in files get built --- doc/include.am |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/doc/include.am

[tor-commits] [tor/master] We now need automake 1.9 or later

2012-08-27 Thread nickm
commit 5db37bca3d031912f9da10427ec2e73faf621694 Author: Nick Mathewson ni...@torproject.org Date: Fri Aug 24 10:29:05 2012 -0400 We now need automake 1.9 or later Automake 1.7 is too broken to even investigate why it broke at this point. --- Makefile.am |4 ++-- 1 files

[tor-commits] [tor/master] Better fix to avoid loudness on mkdir -p

2012-08-27 Thread nickm
commit 7638612f019b7a2e7d77a4de2bfbbf9fc8c6e33c Author: Jim Meyering meyer...@redhat.com Date: Mon Aug 27 10:05:02 2012 -0400 Better fix to avoid loudness on mkdir -p (commit message by nickm) --- doc/include.am |8 1 files changed, 4 insertions(+), 4 deletions(-)

[tor-commits] [tor/master] Update .gitignore with new autotools droppings from nonrecursive make

2012-08-27 Thread nickm
commit f1b33ce81a68dae2db2e3b0f9bbd6715de8ec3bd Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 10:11:55 2012 -0400 Update .gitignore with new autotools droppings from nonrecursive make --- .gitignore |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git

[tor-commits] [tor/master] build: minimal adjustments to make out-of-tree build work

2012-08-27 Thread nickm
commit 90d1c8575726f2169b9cdb7f7eb28b01e30cae80 Author: Jim Meyering meyer...@redhat.com Date: Mon Aug 27 10:00:22 2012 -0400 build: minimal adjustments to make out-of-tree build work --- Makefile.am |1 + src/common/include.am |1 + src/or/include.am | 30

[tor-commits] [tor/master] Changes file for nonrecursive make branch

2012-08-27 Thread nickm
commit 09d90b1b65066e79dc6de59f2ffca9e28ab5e7ea Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 10:28:45 2012 -0400 Changes file for nonrecursive make branch --- changes/nonrecursive_make | 16 1 files changed, 16 insertions(+), 0 deletions(-) diff --git

[tor-commits] [tor/master] Merge branch 'bug6524_nm'

2012-08-27 Thread nickm
commit 7795f42e4be2d04d3f40e227a094dbdce533b173 Merge: b3b4f31 09d90b1 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 10:33:24 2012 -0400 Merge branch 'bug6524_nm' .gitignore |3 +- Makefile.am | 21 -

[tor-commits] [tor/master] Fix whitespace

2012-08-27 Thread nickm
commit 5898c09c3ab6c20df822ea919fecc9420a48aa7b Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 10:53:40 2012 -0400 Fix whitespace --- src/or/connection.c |2 +- src/or/nodelist.c |1 + src/or/relay.c |4 ++-- src/or/router.c |1 + 4 files changed, 5

[tor-commits] [compass/master] Fix color of Placeholder text

2012-08-27 Thread karsten
commit f1476bf44696094be41e96053355c81fd633b830 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Mon Aug 27 20:04:09 2012 +0530 Fix color of Placeholder text Firefox ignores -moz-placeholder and instead requires input:-moz-placeholder. This is a bug(#3779) in

[tor-commits] [tor/release-0.2.3] go back in time and revise the 0.2.2.38 blurb too

2012-08-27 Thread arma
commit f14aca34085af1ab9ba274a6cc96f5c7a42748ce Author: Roger Dingledine a...@torproject.org Date: Mon Aug 27 14:26:46 2012 -0400 go back in time and revise the 0.2.2.38 blurb too --- ChangeLog|5 ++--- ReleaseNotes |5 ++---

[tor-commits] [tor/master] and fix them here too

2012-08-27 Thread arma
commit 0ccd57f0f247171d43e325d29bfcc102d877ca1c Author: Roger Dingledine a...@torproject.org Date: Mon Aug 27 14:28:00 2012 -0400 and fix them here too --- ChangeLog|5 ++--- ReleaseNotes |5 ++--- changes/note-releasenote-fix | 10 --

[tor-commits] [compass/master] Add tooltips and expand some table headers

2012-08-27 Thread karsten
commit 4b6a138bcbba4d91e8056694d800f29e5dac74d0 Author: Sathyanarayanan Gunasekaran gsathya@gmail.com Date: Mon Aug 27 20:47:01 2012 +0530 Add tooltips and expand some table headers Tooltips now explain what some of the non-obvious table headers stand for. Some of the

[tor-commits] [tor/maint-0.2.2] Merge branch 'bug6690_022' into maint-0.2.2

2012-08-27 Thread nickm
commit 1c30e6abc93fa086a14d01d838066581a3657285 Merge: d48cebc 62d9628 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:03:48 2012 -0400 Merge branch 'bug6690_022' into maint-0.2.2 changes/bug6690 |7 +++ src/or/policies.c |6 +- 2 files changed, 12

[tor-commits] [tor/maint-0.2.2] Do not assert when comparing a null address/port against a policy

2012-08-27 Thread nickm
commit 62d96284f7e0f81c40d5df7e53dd7b4dfe7e56a5 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 11:52:51 2012 -0400 Do not assert when comparing a null address/port against a policy This can create a remote crash opportunity for/against directory authorities. ---

[tor-commits] [tor/maint-0.2.3] Do not assert when comparing a null address/port against a policy

2012-08-27 Thread nickm
commit 62d96284f7e0f81c40d5df7e53dd7b4dfe7e56a5 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 11:52:51 2012 -0400 Do not assert when comparing a null address/port against a policy This can create a remote crash opportunity for/against directory authorities. ---

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

2012-08-27 Thread nickm
commit 443e4ae1ee0520cead27dd3a21e9f79b1bed8f8b Merge: ce4add4 1c30e6a Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:07:04 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 Conflicts: src/or/policies.c changes/bug6690 |7

[tor-commits] [tor/maint-0.2.3] Merge branch 'bug6690_022' into maint-0.2.2

2012-08-27 Thread nickm
commit 1c30e6abc93fa086a14d01d838066581a3657285 Merge: d48cebc 62d9628 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:03:48 2012 -0400 Merge branch 'bug6690_022' into maint-0.2.2 changes/bug6690 |7 +++ src/or/policies.c |6 +- 2 files changed, 12

[tor-commits] [tor/master] Merge branch 'bug6690_022' into maint-0.2.2

2012-08-27 Thread nickm
commit 1c30e6abc93fa086a14d01d838066581a3657285 Merge: d48cebc 62d9628 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:03:48 2012 -0400 Merge branch 'bug6690_022' into maint-0.2.2 changes/bug6690 |7 +++ src/or/policies.c |6 +- 2 files changed, 12

[tor-commits] [tor/master] Do not assert when comparing a null address/port against a policy

2012-08-27 Thread nickm
commit 62d96284f7e0f81c40d5df7e53dd7b4dfe7e56a5 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 11:52:51 2012 -0400 Do not assert when comparing a null address/port against a policy This can create a remote crash opportunity for/against directory authorities. ---

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

2012-08-27 Thread nickm
commit 443e4ae1ee0520cead27dd3a21e9f79b1bed8f8b Merge: ce4add4 1c30e6a Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:07:04 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 Conflicts: src/or/policies.c changes/bug6690 |7

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

2012-08-27 Thread nickm
commit e232938ec82c8c35b99331995d1aeaca67ba9ec1 Merge: 0ccd57f 443e4ae Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:09:29 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6690 |7 +++ src/or/policies.c |6 +- 2 files changed, 12

[tor-commits] [tor/maint-0.2.3] Disable extending to private/internal addresses by default

2012-08-27 Thread nickm
commit b7c172c9ec762363562220a354feefc521970d7c Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 11:16:44 2012 -0400 Disable extending to private/internal addresses by default This is important, since otherwise an attacker can use timing info to probe the internal

[tor-commits] [tor/maint-0.2.3] Fix changes file for 6710: before 0.0.8pre1, you couldn't extend to

2012-08-27 Thread nickm
commit 45b520b6a4872a5c52b934df9c345e04536568b1 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 12:29:04 2012 -0400 Fix changes file for 6710: before 0.0.8pre1, you couldn't extend to a router that another router wasn't already connected to. --- changes/bug6710 |3 +--

[tor-commits] [tor/maint-0.2.3] Merge branch 'bug6710_023' into maint-0.2.3

2012-08-27 Thread nickm
commit bffe0d3ccc6b49975eae9173b0c1c465d40d2dbf Merge: 443e4ae 45b520b Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:15:01 2012 -0400 Merge branch 'bug6710_023' into maint-0.2.3 changes/bug6710 |6 ++ doc/tor.1.txt |6 ++

[tor-commits] [tor/master] Disable extending to private/internal addresses by default

2012-08-27 Thread nickm
commit b7c172c9ec762363562220a354feefc521970d7c Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 11:16:44 2012 -0400 Disable extending to private/internal addresses by default This is important, since otherwise an attacker can use timing info to probe the internal

[tor-commits] [tor/master] Fix changes file for 6710: before 0.0.8pre1, you couldn't extend to

2012-08-27 Thread nickm
commit 45b520b6a4872a5c52b934df9c345e04536568b1 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 12:29:04 2012 -0400 Fix changes file for 6710: before 0.0.8pre1, you couldn't extend to a router that another router wasn't already connected to. --- changes/bug6710 |3 +--

[tor-commits] [tor/master] Merge branch 'bug6710_023' into maint-0.2.3

2012-08-27 Thread nickm
commit bffe0d3ccc6b49975eae9173b0c1c465d40d2dbf Merge: 443e4ae 45b520b Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:15:01 2012 -0400 Merge branch 'bug6710_023' into maint-0.2.3 changes/bug6710 |6 ++ doc/tor.1.txt |6 ++

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

2012-08-27 Thread nickm
commit 0c5a44ed0a790951bdfd319eec734c04eb972a08 Merge: e232938 bffe0d3 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:16:27 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6710 |6 ++ doc/tor.1.txt |6 ++

[tor-commits] [tor/maint-0.2.3] Merge branch 'disable_pathbias_warnings_v2' into maint-0.2.3

2012-08-27 Thread nickm
commit d98f2996b0b7b8629ac05662976cb3e4f100efcd Merge: bffe0d3 b252ffa Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:19:52 2012 -0400 Merge branch 'disable_pathbias_warnings_v2' into maint-0.2.3 changes/disable_pathbias_messages |3 +++ src/or/circuitbuild.c

[tor-commits] [tor/maint-0.2.3] Downgrade path-bias warning messages to INFO for now.

2012-08-27 Thread nickm
commit b252ffa7cb641398ee19886f71380cd6190bcebc Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 10:46:17 2012 -0400 Downgrade path-bias warning messages to INFO for now. We've had over two months to fix them, and didn't. Now we need 0.2.3.x stable. Yes, it would

[tor-commits] [tor/master] Merge branch 'disable_pathbias_warnings_v2' into maint-0.2.3

2012-08-27 Thread nickm
commit d98f2996b0b7b8629ac05662976cb3e4f100efcd Merge: bffe0d3 b252ffa Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:19:52 2012 -0400 Merge branch 'disable_pathbias_warnings_v2' into maint-0.2.3 changes/disable_pathbias_messages |3 +++ src/or/circuitbuild.c

[tor-commits] [tor/master] Merge (with -s ours) remote-tracking branch 'origin/maint-0.2.3'

2012-08-27 Thread nickm
commit 2776a6b8103e745a9be8fc181a2b10273289a5e1 Merge: 0c5a44e d98f299 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:21:10 2012 -0400 Merge (with -s ours) remote-tracking branch 'origin/maint-0.2.3' We are doing this merge to avoid taking the patch from

[tor-commits] [tor/master] Downgrade path-bias warning messages to INFO for now.

2012-08-27 Thread nickm
commit b252ffa7cb641398ee19886f71380cd6190bcebc Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 10:46:17 2012 -0400 Downgrade path-bias warning messages to INFO for now. We've had over two months to fix them, and didn't. Now we need 0.2.3.x stable. Yes, it would

[tor-commits] [tor/master] Bug 6475: Demote pathbias log messages for 0.2.3.x

2012-08-27 Thread nickm
commit 4950618b135073f23f250520b01a80dd36e5a43f Author: Mike Perry mikeperry-...@fscked.org Date: Tue Aug 21 18:37:08 2012 -0700 Bug 6475: Demote pathbias log messages for 0.2.3.x Also make a couple of them less scary. We'll do a separate, additional commit on 0.2.4.x to

[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry/bug6647'

2012-08-27 Thread nickm
commit f40378118c711da6bf6d3ee2f247189306abad22 Merge: 2776a6b 0c13547 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:23:19 2012 -0400 Merge remote-tracking branch 'mikeperry/bug6647' changes/bug6647 |7 + src/or/circuitbuild.c | 59

[tor-commits] [tor/maint-0.2.3] Quiet Set buildtimeout to low val warnings: make them info

2012-08-27 Thread nickm
commit a7a4bbff47c92aa4df0a932492867d1601834118 Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:37:09 2012 -0400 Quiet Set buildtimeout to low val warnings: make them info Fix for #6251 --- changes/bug6251 |6 ++ src/or/circuitbuild.c |2 +- 2

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

2012-08-27 Thread nickm
commit 3363a0d26e553378084415b1bcc67c36929d9c07 Merge: f403781 a7a4bbf Author: Nick Mathewson ni...@torproject.org Date: Mon Aug 27 16:39:30 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6251 |6 ++ src/or/circuitbuild.c |2 +- 2 files changed,

[tor-commits] r25772: {website} Patch by Ondrej (website/trunk/docs/en)

2012-08-27 Thread Peter Palfrader
Author: weasel Date: 2012-08-27 20:52:57 + (Mon, 27 Aug 2012) New Revision: 25772 Modified: website/trunk/docs/en/rpms.wml Log: Patch by Ondrej Modified: website/trunk/docs/en/rpms.wml === --- website/trunk/docs/en/rpms.wml

[tor-commits] [tor-cloud/master] new config for blocking diagnostics

2012-08-27 Thread runa
commit 05a2bebdb2597b94e8390f40ef883bd97e770559 Author: Runa A. Sandvik runa.sand...@gmail.com Date: Tue Aug 28 00:44:05 2012 +0100 new config for blocking diagnostics --- ec2-prep.sh | 33 +++-- 1 files changed, 31 insertions(+), 2 deletions(-) diff --git

[tor-commits] r25773: {website} remove the expired keys per #6706. (website/trunk/docs/en)

2012-08-27 Thread Andrew Lewman
Author: phobos Date: 2012-08-28 00:15:36 + (Tue, 28 Aug 2012) New Revision: 25773 Modified: website/trunk/docs/en/signing-keys.wml Log: remove the expired keys per #6706. Modified: website/trunk/docs/en/signing-keys.wml ===

[tor-commits] r25774: {website} dir-spec-v1 is obsolete; don't link to it anymore (website/trunk/docs/en)

2012-08-27 Thread Roger Dingledine
Author: arma Date: 2012-08-28 00:16:13 + (Tue, 28 Aug 2012) New Revision: 25774 Modified: website/trunk/docs/en/documentation.wml Log: dir-spec-v1 is obsolete; don't link to it anymore Modified: website/trunk/docs/en/documentation.wml

[tor-commits] [tor-cloud/master] update more parts of the build script

2012-08-27 Thread runa
commit 2526fe7b6931ef2483af94b4f0befd07952a2184 Author: Runa A. Sandvik runa.sand...@gmail.com Date: Tue Aug 28 01:43:36 2012 +0100 update more parts of the build script --- ec2-prep.sh |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh