[tor-commits] [weather/master] Use correct mailing list when mailing new Tor relay operators. Thanks, Michael.

2011-03-06 Thread kaner
commit 45a0fd1f6e05633f4f14214849c5279e16f595fc Author: Christian Fromme ka...@strace.org Date: Sun Mar 6 14:44:23 2011 +0100 Use correct mailing list when mailing new Tor relay operators. Thanks, Michael. --- weather/weatherapp/emails.py |7 +++ 1 files changed, 3 insertions(+),

[tor-commits] [tor/maint-0.2.1] exit_policy_is_general_exit is IPv4 only; it should admit it.

2011-03-06 Thread nickm
commit 8b01fd7badc893b849d4394a2b72d422eecf7913 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:16:53 2011 -0500 exit_policy_is_general_exit is IPv4 only; it should admit it. --- src/or/policies.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.1] Changes file for ipv6 parsing issue

2011-03-06 Thread nickm
commit fb421c00052cfebda33c4d42346c7eeef30f865f Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:15:32 2011 -0500 Changes file for ipv6 parsing issue --- changes/ipv6_crash |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/ipv6_crash

[tor-commits] [tor/maint-0.2.1] Disallow reject6 and accept6 lines in descriptors

2011-03-06 Thread nickm
commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8 Author: Sebastian Hahn sebast...@torproject.org Date: Sun Mar 6 18:20:28 2011 +0100 Disallow reject6 and accept6 lines in descriptors This fixes a remotely triggerable assert on directory authorities, who don't handle descriptors

[tor-commits] [tor/maint-0.2.2] Changes file for ipv6 parsing issue

2011-03-06 Thread nickm
commit fb421c00052cfebda33c4d42346c7eeef30f865f Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:15:32 2011 -0500 Changes file for ipv6 parsing issue --- changes/ipv6_crash |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/ipv6_crash

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

2011-03-06 Thread nickm
commit ed14888e7e9ffb1877ddb7780b5033314d244fb3 Merge: 9f61450 8b01fd7 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:20:21 2011 -0500 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 Conflicts: src/or/policies.c changes/ipv6_crash |3 +++

[tor-commits] [tor/maint-0.2.1] Do not serve encrypt-only descriptors with the all request. Reported by piebeer

2011-03-06 Thread nickm
commit bcbc8c51cbc026e73e831f6641f5d1fd6ebebd9d Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 3 23:51:07 2011 -0500 Do not serve encrypt-only descriptors with the all request. Reported by piebeer --- src/or/dirserv.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

[tor-commits] [tor/maint-0.2.1] changes file for careful_with_all_descs

2011-03-06 Thread nickm
commit b231026c42ea5cd884b4bde25cde3ba2c6e5ca98 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:35:24 2011 -0500 changes file for careful_with_all_descs --- changes/all_descs |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/all_descs

[tor-commits] [tor/maint-0.2.1] Revert Disallow reject6 and accept6 lines in descriptors

2011-03-06 Thread nickm
commit 3da0837b0b114bb320a244679325d25d664752c1 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:26:38 2011 -0500 Revert Disallow reject6 and accept6 lines in descriptors This reverts commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8. --- src/or/routerparse.c |2 ++

[tor-commits] [tor/maint-0.2.1] Oops, here's the *REAL* fix for the ipv6 issue

2011-03-06 Thread nickm
commit 2ce132e335d60c7ef1d01aa00db5ab4c5b7d674f Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:31:06 2011 -0500 Oops, here's the *REAL* fix for the ipv6 issue We need to _REJECT_ descriptors with accept6/reject6 lines. If we let them onto the network , other

[tor-commits] [tor/maint-0.2.1] Merge branch 'careful_with_all_descs' into maint-0.2.1

2011-03-06 Thread nickm
commit 0f637492e30e19ad7abeedafdd58c087f01b4527 Merge: 8b01fd7 b231026 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:35:42 2011 -0500 Merge branch 'careful_with_all_descs' into maint-0.2.1 changes/all_descs |4 src/or/dirserv.c |2 ++ 2 files changed, 6

[tor-commits] [tor/maint-0.2.1] Merge branch 'real_ipv6_fix' into maint-0.2.1

2011-03-06 Thread nickm
commit 4fa70e11ed93e8f2d67dfab6f64080a0d017e2d9 Merge: 0f63749 2ce132e Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:42:05 2011 -0500 Merge branch 'real_ipv6_fix' into maint-0.2.1 changes/ipv6_crash |5 +++-- src/or/routerparse.c |8 2 files changed, 11

[tor-commits] [tor/maint-0.2.2] Do not serve encrypt-only descriptors with the all request. Reported by piebeer

2011-03-06 Thread nickm
commit bcbc8c51cbc026e73e831f6641f5d1fd6ebebd9d Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 3 23:51:07 2011 -0500 Do not serve encrypt-only descriptors with the all request. Reported by piebeer --- src/or/dirserv.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

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

2011-03-06 Thread nickm
commit 4fa70e11ed93e8f2d67dfab6f64080a0d017e2d9 Merge: 0f63749 2ce132e Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:42:05 2011 -0500 Merge branch 'real_ipv6_fix' into maint-0.2.1 changes/ipv6_crash |5 +++-- src/or/routerparse.c |8 2 files changed, 11

[tor-commits] [tor/master] Changes file for ipv6 parsing issue

2011-03-06 Thread nickm
commit fb421c00052cfebda33c4d42346c7eeef30f865f Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:15:32 2011 -0500 Changes file for ipv6 parsing issue --- changes/ipv6_crash |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/ipv6_crash

[tor-commits] [tor/master] exit_policy_is_general_exit is IPv4 only; it should admit it.

2011-03-06 Thread nickm
commit 8b01fd7badc893b849d4394a2b72d422eecf7913 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:16:53 2011 -0500 exit_policy_is_general_exit is IPv4 only; it should admit it. --- src/or/policies.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git

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

2011-03-06 Thread nickm
commit 07b8b439c4bee7545a26a61160b2860b18b88185 Merge: c6d8e75 ed14888 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:23:02 2011 -0500 Merge remote branch 'origin/maint-0.2.2' changes/ipv6_crash |3 +++ src/or/policies.c|2 ++ src/or/routerparse.c |2 --

[tor-commits] [tor/master] Do not serve encrypt-only descriptors with the all request. Reported by piebeer

2011-03-06 Thread nickm
commit bcbc8c51cbc026e73e831f6641f5d1fd6ebebd9d Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 3 23:51:07 2011 -0500 Do not serve encrypt-only descriptors with the all request. Reported by piebeer --- src/or/dirserv.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

[tor-commits] [tor/master] Revert Disallow reject6 and accept6 lines in descriptors

2011-03-06 Thread nickm
commit 3da0837b0b114bb320a244679325d25d664752c1 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:26:38 2011 -0500 Revert Disallow reject6 and accept6 lines in descriptors This reverts commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8. --- src/or/routerparse.c |2 ++

[tor-commits] [tor/master] changes file for careful_with_all_descs

2011-03-06 Thread nickm
commit b231026c42ea5cd884b4bde25cde3ba2c6e5ca98 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:35:24 2011 -0500 changes file for careful_with_all_descs --- changes/all_descs |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/all_descs

[tor-commits] [tor/master] Merge branch 'careful_with_all_descs' into maint-0.2.1

2011-03-06 Thread nickm
commit 0f637492e30e19ad7abeedafdd58c087f01b4527 Merge: 8b01fd7 b231026 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:35:42 2011 -0500 Merge branch 'careful_with_all_descs' into maint-0.2.1 changes/all_descs |4 src/or/dirserv.c |2 ++ 2 files changed, 6

[tor-commits] [tor/master] Oops, here's the *REAL* fix for the ipv6 issue

2011-03-06 Thread nickm
commit 2ce132e335d60c7ef1d01aa00db5ab4c5b7d674f Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:31:06 2011 -0500 Oops, here's the *REAL* fix for the ipv6 issue We need to _REJECT_ descriptors with accept6/reject6 lines. If we let them onto the network , other

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

2011-03-06 Thread nickm
commit 176e8a0a2aa25839a8ad9f921971703cdd331eb0 Merge: 07b8b43 35fcec3 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:46:11 2011 -0500 Merge remote branch 'origin/maint-0.2.2' Conflicts: src/or/routerparse.c changes/all_descs|4

[tor-commits] [torbrowser/master] add the osx .12/.22-alpha release

2011-03-06 Thread erinn
commit 8b13bbf7e16c4f89b8a8acd6f195547a1baa1a0f Author: Erinn Clark er...@torproject.org Date: Thu Feb 3 14:12:54 2011 +0100 add the osx .12/.22-alpha release --- build-scripts/osx.mk |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk

[tor-commits] [torbrowser/master] commit tbb linux 1.1.4 makefile version changes

2011-03-06 Thread erinn
commit f34d9020a24d910c1171600a7b111e28a2305208 Author: Erinn Clark er...@torproject.org Date: Fri Feb 4 02:06:35 2011 -0800 commit tbb linux 1.1.4 makefile version changes --- build-scripts/linux.mk |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [torbrowser/master] bump tbb windows to 1.3.19 for firefox 3.6.14

2011-03-06 Thread erinn
commit 4a8fe511f6f8ef4f574348405ad899307b8ef506 Author: Erinn Clark er...@torproject.org Date: Sat Mar 5 19:45:30 2011 +0100 bump tbb windows to 1.3.19 for firefox 3.6.14 --- README |5 - build-scripts/Makefile |6 +++--- 2 files changed, 7 insertions(+), 4

[tor-commits] [torbrowser/master] bump tbb osx to 1.0.13-dev for firefox 3.6.15

2011-03-06 Thread erinn
commit 9fa4748f4465d90bdba5c9d143aa09f31d8bdda5 Author: Erinn Clark er...@torproject.org Date: Sat Mar 5 19:51:36 2011 +0100 bump tbb osx to 1.0.13-dev for firefox 3.6.15 --- README.OSX | 12 +--- build-scripts/osx.mk |8 2 files changed, 13 insertions(+),

[tor-commits] [torbrowser/master] remove linux-related things from OSX launch script

2011-03-06 Thread erinn
commit 3613531f94ebcbe2ce89dbf2eae39c253d6f6fc5 Author: Erinn Clark er...@torproject.org Date: Sat Mar 5 19:52:37 2011 +0100 remove linux-related things from OSX launch script --- src/RelativeLink/RelativeLinkOSX.sh |7 +-- 1 files changed, 1 insertions(+), 6 deletions(-) diff

[tor-commits] [torbrowser/master] bump tbb linux to 1.1.5-dev for firefox 3.6.15

2011-03-06 Thread erinn
commit aa690bbce0ecb364c9b523957a9b5ed3eb19d819 Author: Erinn Clark er...@torproject.org Date: Sat Mar 5 20:00:48 2011 +0100 bump tbb linux to 1.1.5-dev for firefox 3.6.15 --- README.Linux | 11 --- build-scripts/linux.mk |8 2 files changed, 12

[tor-commits] [torbrowser/master] bump tbb windows to 1.3.20 for firefox 3.6.15

2011-03-06 Thread erinn
commit 6548f37aa21af88c8d2d6a9ec2297f6f30995d39 Author: Erinn Clark er...@torproject.org Date: Sun Mar 6 15:13:12 2011 -0800 bump tbb windows to 1.3.20 for firefox 3.6.15 --- README |7 +-- build-scripts/Makefile |6 +++--- 2 files changed, 8 insertions(+), 5

[tor-commits] [torbrowser/master] update OSX's copyright and version info in the info.plist

2011-03-06 Thread erinn
commit 1a2b87708f551918d7d3767bdbd3f9667b63aecb Author: Erinn Clark er...@torproject.org Date: Sat Mar 5 19:56:38 2011 +0100 update OSX's copyright and version info in the info.plist --- build-scripts/config/Info.plist |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff

[tor-commits] [tor/release-0.2.2] Do not serve encrypt-only descriptors with the all request. Reported by piebeer

2011-03-06 Thread arma
commit bcbc8c51cbc026e73e831f6641f5d1fd6ebebd9d Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 3 23:51:07 2011 -0500 Do not serve encrypt-only descriptors with the all request. Reported by piebeer --- src/or/dirserv.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

[tor-commits] [tor/release-0.2.2] Changes file for ipv6 parsing issue

2011-03-06 Thread arma
commit fb421c00052cfebda33c4d42346c7eeef30f865f Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:15:32 2011 -0500 Changes file for ipv6 parsing issue --- changes/ipv6_crash |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/ipv6_crash

[tor-commits] [tor/release-0.2.2] exit_policy_is_general_exit is IPv4 only; it should admit it.

2011-03-06 Thread arma
commit 8b01fd7badc893b849d4394a2b72d422eecf7913 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:16:53 2011 -0500 exit_policy_is_general_exit is IPv4 only; it should admit it. --- src/or/policies.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git

[tor-commits] [tor/release-0.2.2] Disallow reject6 and accept6 lines in descriptors

2011-03-06 Thread arma
commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8 Author: Sebastian Hahn sebast...@torproject.org Date: Sun Mar 6 18:20:28 2011 +0100 Disallow reject6 and accept6 lines in descriptors This fixes a remotely triggerable assert on directory authorities, who don't handle descriptors

[tor-commits] [tor/release-0.2.2] Oops, here's the *REAL* fix for the ipv6 issue

2011-03-06 Thread arma
commit 2ce132e335d60c7ef1d01aa00db5ab4c5b7d674f Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:31:06 2011 -0500 Oops, here's the *REAL* fix for the ipv6 issue We need to _REJECT_ descriptors with accept6/reject6 lines. If we let them onto the network , other

[tor-commits] [tor/release-0.2.2] Revert Disallow reject6 and accept6 lines in descriptors

2011-03-06 Thread arma
commit 3da0837b0b114bb320a244679325d25d664752c1 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:26:38 2011 -0500 Revert Disallow reject6 and accept6 lines in descriptors This reverts commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8. --- src/or/routerparse.c |2 ++

[tor-commits] [tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

2011-03-06 Thread arma
commit ed14888e7e9ffb1877ddb7780b5033314d244fb3 Merge: 9f61450 8b01fd7 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:20:21 2011 -0500 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 Conflicts: src/or/policies.c changes/ipv6_crash |3 +++

[tor-commits] [tor/release-0.2.2] Merge branch 'real_ipv6_fix' into maint-0.2.1

2011-03-06 Thread arma
commit 4fa70e11ed93e8f2d67dfab6f64080a0d017e2d9 Merge: 0f63749 2ce132e Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:42:05 2011 -0500 Merge branch 'real_ipv6_fix' into maint-0.2.1 changes/ipv6_crash |5 +++-- src/or/routerparse.c |8 2 files changed, 11

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

2011-03-06 Thread arma
commit 20569f9297fad0874c68a069fe9032c84dc583c6 Merge: b3820e0 35fcec3 Author: Roger Dingledine a...@torproject.org Date: Sun Mar 6 20:21:46 2011 -0500 Merge branch 'maint-0.2.2' into release-0.2.2 changes/all_descs|4 changes/ipv6_crash |4 src/or/dirserv.c |

[tor-commits] [tor/release-0.2.2] Merge branch 'careful_with_all_descs' into maint-0.2.1

2011-03-06 Thread arma
commit 0f637492e30e19ad7abeedafdd58c087f01b4527 Merge: 8b01fd7 b231026 Author: Nick Mathewson ni...@torproject.org Date: Sun Mar 6 13:35:42 2011 -0500 Merge branch 'careful_with_all_descs' into maint-0.2.1 changes/all_descs |4 src/or/dirserv.c |2 ++ 2 files changed, 6