[tor-commits] r26118: {website} removed tor-assistants address from contact website (website/trunk/about/en)

2013-03-18 Thread Moritz Bartl
Author: moritz Date: 2013-03-19 04:02:00 + (Tue, 19 Mar 2013) New Revision: 26118 Modified: website/trunk/about/en/contact.wml Log: removed tor-assistants address from contact website Modified: website/trunk/about/en/contact.wml =

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

2013-03-18 Thread translation
commit e1535826f1529ef3325a655a8f5f3c4ba189877f Author: Translation commit bot Date: Tue Mar 19 03:15:30 2013 + Update translations for vidalia_help --- tr/config.po | 11 ++- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tr/config.po b/tr/config.po index 413

[tor-commits] [stem/master] Test accidently left around a file in /tmp

2013-03-18 Thread atagar
commit decc35249d2605644aec5a3ef5bb337cd0d41175 Author: Damian Johnson Date: Mon Mar 18 18:40:13 2013 -0700 Test accidently left around a file in /tmp The test_save_processed_files_malformed checks that save_processed_files() fails when presented with malformed data. However, t

[tor-commits] [stem/master] Only query by name for relays with the Named flag

2013-03-18 Thread atagar
commit 8099efdecf3d64abef787d1b19b537c4b9c30088 Author: Damian Johnson Date: Mon Mar 18 18:32:28 2013 -0700 Only query by name for relays with the Named flag Our integ tests pick a relay at random from its present consensus to test the 'GETINFO desc/name/*', 'md/name/*', and '

[tor-commits] [stem/master] Skipping tests that fail when run as root

2013-03-18 Thread atagar
commit 6862dc4994996e78ebf4516094c29aad66ceb524 Author: Damian Johnson Date: Mon Mar 18 18:20:35 2013 -0700 Skipping tests that fail when run as root Some of our integ tests rely on permission failures for files we lack access to, or path expansions. Running as root causes thes

[tor-commits] [stem/master] The 'name' attribute of TarInfo classes can't be set in python 3

2013-03-18 Thread atagar
commit 98fd0a7ba4787340d05d0baf341594555da87d00 Author: Damian Johnson Date: Mon Mar 18 16:36:11 2013 -0700 The 'name' attribute of TarInfo classes can't be set in python 3 Workaround for the 'name' attribute being unwriteable in python 3. On reflection this is a little more el

[tor-commits] [stem/master] Fixing open() mock for python 3

2013-03-18 Thread atagar
commit c40ea0fb2f2188d540655cfc4c6975bffc9585b2 Author: Damian Johnson Date: Mon Mar 18 16:19:39 2013 -0700 Fixing open() mock for python 3 Our unit tests were broken under python 3 due to needing a slightly different mock for the open() function.

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

2013-03-18 Thread translation
commit 0411fd5cebeec8c36cc8be7edcd91cd6f0f5b9c8 Author: Translation commit bot Date: Tue Mar 19 01:16:02 2013 + Update translations for https_everywhere_completed --- lt/https-everywhere.properties |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/lt/https-ev

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

2013-03-18 Thread translation
commit 0547184e194d5e8d286eda84d9ef0929f9311b67 Author: Translation commit bot Date: Tue Mar 19 01:15:57 2013 + Update translations for https_everywhere --- lt/https-everywhere.properties |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lt/https-everywher

[tor-commits] r26117: {website} Dropping commented out project ideas Why are we still bundli (website/trunk/getinvolved/en)

2013-03-18 Thread Damian Johnson
Author: atagar Date: 2013-03-18 22:50:47 + (Mon, 18 Mar 2013) New Revision: 26117 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Dropping commented out project ideas Why are we still bundling dozens of commented out tasks with the page? If we want to add these back in later then

[tor-commits] r26116: {website} Adding JTor back to the volunteer page Now that someone's du (website/trunk/getinvolved/en)

2013-03-18 Thread Damian Johnson
Author: atagar Date: 2013-03-18 22:32:51 + (Mon, 18 Mar 2013) New Revision: 26116 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Adding JTor back to the volunteer page Now that someone's dusting off JTor and making commits to it adding it back to the project table. Modified:

[tor-commits] r26115: {website} Dropping 'Improving TorBirdy' When I've spoken with Sukhbir (website/trunk/getinvolved/en)

2013-03-18 Thread Damian Johnson
Author: atagar Date: 2013-03-18 22:07:53 + (Mon, 18 Mar 2013) New Revision: 26115 Modified: website/trunk/getinvolved/en/volunteer.wml Log: Dropping 'Improving TorBirdy' When I've spoken with Sukhbir he mentioned that he doesn't think there's enough torbirdy tasks remaining to fill a summe

[tor-commits] [stem/master] Dropping the memory usage assertion when reading descriptors

2013-03-18 Thread atagar
commit bc155d6ee800c1741fb7b1b7780cf696217115f4 Author: Damian Johnson Date: Mon Mar 18 14:00:45 2013 -0700 Dropping the memory usage assertion when reading descriptors Our integ test for reading descriptors tries to check that we aren't consuming gobs of memory. Unfortunately

[tor-commits] [stem/master] Tor switched from server to microdescriptors in 0.2.3.3

2013-03-18 Thread atagar
commit c614080d911cec936a90b1f106e777f962ad8249 Author: Damian Johnson Date: Mon Mar 18 13:53:17 2013 -0700 Tor switched from server to microdescriptors in 0.2.3.3 --- stem/version.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/stem/version.py b/stem/version.p

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

2013-03-18 Thread nickm
commit 6e94d2fb3a11d7cba5796c1662e0c5089ad3e509 Merge: b0f7af1 597cd89 Author: Nick Mathewson Date: Mon Mar 18 16:36:52 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug6174 |6 ++ src/or/circuitbuild.c|2 +- src/or/circuitlist.c | 12

[tor-commits] [tor/master] Rename circuit_expire_all_dirty_circs

2013-03-18 Thread nickm
commit 7bb51fdd89feb5ea3eb7e0a0b76c0dda0e50a82e Author: Nick Mathewson Date: Tue Feb 19 18:37:03 2013 -0500 Rename circuit_expire_all_dirty_circs The new name is circuit_mark_all_dirty_circs_as_unusable. This resolves an XXX024 --- src/or/circuitbuild.c |2 +- src/or/

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug6174' into maint-0.2.4

2013-03-18 Thread nickm
commit 597cd893c557f8e05be98b6cade1b312fc6f0f8d Merge: 01407f9 7bb51fd Author: Nick Mathewson Date: Mon Mar 18 16:36:25 2013 -0400 Merge remote-tracking branch 'public/bug6174' into maint-0.2.4 changes/bug6174 |6 ++ src/or/circuitbuild.c|2 +- src/or/circuitlist.

[tor-commits] [tor/master] Stop frobbing timestamp_dirty as our sole means to mark circuits unusable

2013-03-18 Thread nickm
commit 62fb209d837f3f5510075ef8bdb6e231ebdfa9bc Author: Nick Mathewson Date: Tue Feb 19 18:29:17 2013 -0500 Stop frobbing timestamp_dirty as our sole means to mark circuits unusable In a number of places, we decrement timestamp_dirty by MaxCircuitDirtiness in order to mark a st

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug6174' into maint-0.2.4

2013-03-18 Thread nickm
commit 597cd893c557f8e05be98b6cade1b312fc6f0f8d Merge: 01407f9 7bb51fd Author: Nick Mathewson Date: Mon Mar 18 16:36:25 2013 -0400 Merge remote-tracking branch 'public/bug6174' into maint-0.2.4 changes/bug6174 |6 ++ src/or/circuitbuild.c|2 +- src/or/circuitlist.

[tor-commits] [tor/maint-0.2.4] Rename circuit_expire_all_dirty_circs

2013-03-18 Thread nickm
commit 7bb51fdd89feb5ea3eb7e0a0b76c0dda0e50a82e Author: Nick Mathewson Date: Tue Feb 19 18:37:03 2013 -0500 Rename circuit_expire_all_dirty_circs The new name is circuit_mark_all_dirty_circs_as_unusable. This resolves an XXX024 --- src/or/circuitbuild.c |2 +- src/or/

[tor-commits] [tor/maint-0.2.4] Stop frobbing timestamp_dirty as our sole means to mark circuits unusable

2013-03-18 Thread nickm
commit 62fb209d837f3f5510075ef8bdb6e231ebdfa9bc Author: Nick Mathewson Date: Tue Feb 19 18:29:17 2013 -0500 Stop frobbing timestamp_dirty as our sole means to mark circuits unusable In a number of places, we decrement timestamp_dirty by MaxCircuitDirtiness in order to mark a st

[tor-commits] [stem/master] Digest validation fails for 'non-ascii_descriptor'

2013-03-18 Thread atagar
commit bf5bac34abf95f1e12f0ce4030c305c364939c1f Author: Damian Johnson Date: Mon Mar 18 13:34:41 2013 -0700 Digest validation fails for 'non-ascii_descriptor' The 'non-ascii_descriptor' test descriptor fails digest validation due to being slightly modified. Finding that descri

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

2013-03-18 Thread nickm
commit b0f7af16156ef7d0c401485c6e7a533857f7b316 Merge: 899c280 01407f9 Author: Nick Mathewson Date: Mon Mar 18 16:34:29 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8062 |5 + src/or/or.h |4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug8062' into maint-0.2.4

2013-03-18 Thread nickm
commit 01407f9718a7b1eb4e43b46c2799a390551aad29 Merge: dbdc994 fca578d Author: Nick Mathewson Date: Mon Mar 18 16:33:47 2013 -0400 Merge remote-tracking branch 'public/bug8062' into maint-0.2.4 changes/bug8062 |5 + src/or/or.h |4 ++-- 2 files changed, 7 insertions(+), 2

[tor-commits] [tor/master] Increase link_proto field to 2 bytes

2013-03-18 Thread nickm
commit fca578d9b56d7d80fc43f21b77153d7e5cad92d6 Author: Nick Mathewson Date: Mon Mar 11 12:34:14 2013 -0400 Increase link_proto field to 2 bytes This should have been 2 bytes all along, since version numbers can be 16 bits long. This isn't a live bug, since the call to is_

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8062' into maint-0.2.4

2013-03-18 Thread nickm
commit 01407f9718a7b1eb4e43b46c2799a390551aad29 Merge: dbdc994 fca578d Author: Nick Mathewson Date: Mon Mar 18 16:33:47 2013 -0400 Merge remote-tracking branch 'public/bug8062' into maint-0.2.4 changes/bug8062 |5 + src/or/or.h |4 ++-- 2 files changed, 7 insertions(+), 2

[tor-commits] [tor/maint-0.2.4] Increase link_proto field to 2 bytes

2013-03-18 Thread nickm
commit fca578d9b56d7d80fc43f21b77153d7e5cad92d6 Author: Nick Mathewson Date: Mon Mar 11 12:34:14 2013 -0400 Increase link_proto field to 2 bytes This should have been 2 bytes all along, since version numbers can be 16 bits long. This isn't a live bug, since the call to is_

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

2013-03-18 Thread nickm
commit 899c2805b158e0e82ad6979a49b549793364c0d5 Merge: d404b02 dbdc994 Author: Nick Mathewson Date: Mon Mar 18 15:57:51 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug7947 |4 src/or/relay.c |8 2 files changed, 12 insertions(+), 0 deletions

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

2013-03-18 Thread nickm
commit d404b0200ff72a45d7c505a12f0ee98f89d28176 Merge: e5b79b5 aa4fcc4 Author: Nick Mathewson Date: Mon Mar 18 15:46:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/or/dirserv.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) _

[tor-commits] [tor/master] Handle TRUNCATE correctly if our next channel isn't done yet.

2013-03-18 Thread nickm
commit bd9901bef245b3880c9a60034b9fdf6d4829eb65 Author: Nick Mathewson Date: Mon Mar 18 15:55:55 2013 -0400 Handle TRUNCATE correctly if our next channel isn't done yet. Patch from 'cypherpunks'. Fixes bug #7947. Bugfix on 0.0.7.1. --- changes/bug7947 |4 src/or/relay.c

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

2013-03-18 Thread nickm
commit dbdc99483df6f0fdba9f7af8954719d47990a8b8 Merge: aa4fcc4 bd9901b Author: Nick Mathewson Date: Mon Mar 18 15:56:55 2013 -0400 Merge branch 'bug7947' into maint-0.2.4 changes/bug7947 |4 src/or/relay.c |8 2 files changed, 12 insertions(+), 0 deletions(-) ___

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug6164' into maint-0.2.4

2013-03-18 Thread nickm
commit aa4fcc4f13ecc0959f26ac4c86a8e9b59d9c8783 Merge: 0b827cb 5d2b2b9 Author: Nick Mathewson Date: Mon Mar 18 15:45:49 2013 -0400 Merge remote-tracking branch 'public/bug6164' into maint-0.2.4 src/or/dirserv.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ___

[tor-commits] [tor/master] Clear up a comment about when an assertion could fire

2013-03-18 Thread nickm
commit 5d2b2b9ede6ea0f247b5505d7e30a622c312e9fe Author: Nick Mathewson Date: Tue Feb 19 16:23:58 2013 -0500 Clear up a comment about when an assertion could fire Resolves ticket 6164 --- src/or/dirserv.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/

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

2013-03-18 Thread nickm
commit dbdc99483df6f0fdba9f7af8954719d47990a8b8 Merge: aa4fcc4 bd9901b Author: Nick Mathewson Date: Mon Mar 18 15:56:55 2013 -0400 Merge branch 'bug7947' into maint-0.2.4 changes/bug7947 |4 src/or/relay.c |8 2 files changed, 12 insertions(+), 0 deletions(-) _

[tor-commits] [tor/maint-0.2.4] Handle TRUNCATE correctly if our next channel isn't done yet.

2013-03-18 Thread nickm
commit bd9901bef245b3880c9a60034b9fdf6d4829eb65 Author: Nick Mathewson Date: Mon Mar 18 15:55:55 2013 -0400 Handle TRUNCATE correctly if our next channel isn't done yet. Patch from 'cypherpunks'. Fixes bug #7947. Bugfix on 0.0.7.1. --- changes/bug7947 |4 src/or/relay.c

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

2013-03-18 Thread translation
commit 7c6d13cfb9c8e6973436b6596f90a996b520fb1d Author: Translation commit bot Date: Mon Mar 18 19:46:04 2013 + Update translations for https_everywhere_completed --- fi/https-everywhere.properties |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fi/https-everyw

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

2013-03-18 Thread translation
commit d84bc6ea374f7f4875c58edd3e5cb7b11c46c01e Author: Translation commit bot Date: Mon Mar 18 19:45:59 2013 + Update translations for https_everywhere --- fi/https-everywhere.properties |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fi/https-everywhere.prop

[tor-commits] [tor/maint-0.2.4] Clear up a comment about when an assertion could fire

2013-03-18 Thread nickm
commit 5d2b2b9ede6ea0f247b5505d7e30a622c312e9fe Author: Nick Mathewson Date: Tue Feb 19 16:23:58 2013 -0500 Clear up a comment about when an assertion could fire Resolves ticket 6164 --- src/or/dirserv.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug6164' into maint-0.2.4

2013-03-18 Thread nickm
commit aa4fcc4f13ecc0959f26ac4c86a8e9b59d9c8783 Merge: 0b827cb 5d2b2b9 Author: Nick Mathewson Date: Mon Mar 18 15:45:49 2013 -0400 Merge remote-tracking branch 'public/bug6164' into maint-0.2.4 src/or/dirserv.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) __

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

2013-03-18 Thread nickm
commit e5b79b5bb5b699388e6d3016f284a7a3f530c7c9 Merge: 19d6650 0b827cb Author: Nick Mathewson Date: Mon Mar 18 15:44:45 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/common/compat.c | 20 1 files changed, 16 insertions(+), 4 deletions(-)

[tor-commits] [tor/master] Fix another case of bug 8206; patch from flupzor

2013-03-18 Thread nickm
commit 0b827cbcb11abece686d402170bd58724a77e365 Author: Nick Mathewson Date: Mon Mar 18 15:44:23 2013 -0400 Fix another case of bug 8206; patch from flupzor --- src/common/compat.c | 20 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/common/compa

[tor-commits] [tor/maint-0.2.4] Fix another case of bug 8206; patch from flupzor

2013-03-18 Thread nickm
commit 0b827cbcb11abece686d402170bd58724a77e365 Author: Nick Mathewson Date: Mon Mar 18 15:44:23 2013 -0400 Fix another case of bug 8206; patch from flupzor --- src/common/compat.c | 20 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/common/compa

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

2013-03-18 Thread nickm
commit 19d6650f8175744a8bd0153201ddc7d222a925af Merge: c8c86c9 eff1cfa Author: Nick Mathewson Date: Mon Mar 18 15:41:14 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug6673 |4 src/common/crypto.c |6 ++ 2 files changed, 10 insertions(+), 0 del

[tor-commits] [tor/master] Give an #error when we want threads and OpenSSL has disabled threads

2013-03-18 Thread nickm
commit fdafe11a25ad3e7ca8893c8630f86973431217b9 Author: Nick Mathewson Date: Mon Mar 11 13:23:10 2013 -0400 Give an #error when we want threads and OpenSSL has disabled threads Fixes ticket 6673. --- changes/bug6673 |4 src/common/crypto.c |6 ++ 2 files chang

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug6673' into maint-0.2.4

2013-03-18 Thread nickm
commit eff1cfaaf7bf82aefd16b39922b1297e2f8ce2c9 Merge: ad8a27a fdafe11 Author: Nick Mathewson Date: Mon Mar 18 15:40:50 2013 -0400 Merge remote-tracking branch 'public/bug6673' into maint-0.2.4 changes/bug6673 |4 src/common/crypto.c |6 ++ 2 files changed, 10 inserti

[tor-commits] [tor/maint-0.2.4] Give an #error when we want threads and OpenSSL has disabled threads

2013-03-18 Thread nickm
commit fdafe11a25ad3e7ca8893c8630f86973431217b9 Author: Nick Mathewson Date: Mon Mar 11 13:23:10 2013 -0400 Give an #error when we want threads and OpenSSL has disabled threads Fixes ticket 6673. --- changes/bug6673 |4 src/common/crypto.c |6 ++ 2 files chang

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug6673' into maint-0.2.4

2013-03-18 Thread nickm
commit eff1cfaaf7bf82aefd16b39922b1297e2f8ce2c9 Merge: ad8a27a fdafe11 Author: Nick Mathewson Date: Mon Mar 18 15:40:50 2013 -0400 Merge remote-tracking branch 'public/bug6673' into maint-0.2.4 changes/bug6673 |4 src/common/crypto.c |6 ++ 2 files changed, 10 inserti

[tor-commits] [tor/master] Fix a double-newline

2013-03-18 Thread nickm
commit c8c86c9b231af2eebd9ee62396228ac946fd814f Author: Nick Mathewson Date: Mon Mar 18 15:39:47 2013 -0400 Fix a double-newline --- src/test/test_addr.c |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 106f921..4bc6

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

2013-03-18 Thread nickm
commit 5124bc251a2ee7d17a52cb00865467a36f4cea9d Merge: a88f3e2 ad8a27a Author: Nick Mathewson Date: Mon Mar 18 15:39:21 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/or/dnsserv.c|3 ++- src/or/dnsserv.h|3 ++- src/or/entrynodes.c |2 +- 3 files chang

[tor-commits] [tor/master] Fix some wide lines

2013-03-18 Thread nickm
commit ad8a27a3939be92e94d95fd7bb0f4e4b1e03382b Author: Nick Mathewson Date: Mon Mar 18 15:39:11 2013 -0400 Fix some wide lines --- src/or/dnsserv.c|3 ++- src/or/dnsserv.h|3 ++- src/or/entrynodes.c |2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/

[tor-commits] [tor/maint-0.2.4] Fix some wide lines

2013-03-18 Thread nickm
commit ad8a27a3939be92e94d95fd7bb0f4e4b1e03382b Author: Nick Mathewson Date: Mon Mar 18 15:39:11 2013 -0400 Fix some wide lines --- src/or/dnsserv.c|3 ++- src/or/dnsserv.h|3 ++- src/or/entrynodes.c |2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/

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

2013-03-18 Thread nickm
commit a88f3e24eaf2180ac2f374df81b0261661774c5f Merge: 6770939 2ac66e5 Author: Nick Mathewson Date: Mon Mar 18 15:29:32 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' Conflicts: src/test/test_addr.c changes/bug8377 |3 +++ src/common/address.c |

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug8377' into maint-0.2.3

2013-03-18 Thread nickm
commit ebb95d0f781e21a694a8de386ed0b75984b247d4 Merge: c6ca199 165b2c0 Author: Nick Mathewson Date: Mon Mar 18 15:27:50 2013 -0400 Merge remote-tracking branch 'public/bug8377' into maint-0.2.3 changes/bug8377 |3 +++ src/common/address.c |3 ++- src/test/test_addr.c | 36 +

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

2013-03-18 Thread nickm
commit 2ac66e59f7b32bb7f975803c9d483848e755a08f Merge: 5959d1c ebb95d0 Author: Nick Mathewson Date: Mon Mar 18 15:28:39 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/test/test_addr.c changes/bug8377 |3 +++ src/commo

[tor-commits] [tor/master] Add unit test for tor_addr_is_loopback

2013-03-18 Thread nickm
commit 165b2c0123f0ffb1f9507aaa31cdd536b91bccdf Author: Nick Mathewson Date: Fri Mar 1 12:40:41 2013 -0500 Add unit test for tor_addr_is_loopback --- src/test/test_addr.c | 36 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/test/t

[tor-commits] [tor/master] Make sure that [::1] is recognized as a private address

2013-03-18 Thread nickm
commit b528aaef035213dee93663599dc46b1898ae3f8e Author: Nick Mathewson Date: Fri Mar 1 12:22:57 2013 -0500 Make sure that [::1] is recognized as a private address Fixes bug 8377; bugfix on 0.2.1.3-alpha. --- changes/bug8377 |3 +++ src/common/address.c |3 ++- 2 files

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

2013-03-18 Thread nickm
commit 2ac66e59f7b32bb7f975803c9d483848e755a08f Merge: 5959d1c ebb95d0 Author: Nick Mathewson Date: Mon Mar 18 15:28:39 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/test/test_addr.c changes/bug8377 |3 +++ src/commo

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

2013-03-18 Thread nickm
commit ebb95d0f781e21a694a8de386ed0b75984b247d4 Merge: c6ca199 165b2c0 Author: Nick Mathewson Date: Mon Mar 18 15:27:50 2013 -0400 Merge remote-tracking branch 'public/bug8377' into maint-0.2.3 changes/bug8377 |3 +++ src/common/address.c |3 ++- src/test/test_addr.c | 36 +

[tor-commits] [tor/maint-0.2.4] Add unit test for tor_addr_is_loopback

2013-03-18 Thread nickm
commit 165b2c0123f0ffb1f9507aaa31cdd536b91bccdf Author: Nick Mathewson Date: Fri Mar 1 12:40:41 2013 -0500 Add unit test for tor_addr_is_loopback --- src/test/test_addr.c | 36 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/test/t

[tor-commits] [tor/maint-0.2.4] Make sure that [::1] is recognized as a private address

2013-03-18 Thread nickm
commit b528aaef035213dee93663599dc46b1898ae3f8e Author: Nick Mathewson Date: Fri Mar 1 12:22:57 2013 -0500 Make sure that [::1] is recognized as a private address Fixes bug 8377; bugfix on 0.2.1.3-alpha. --- changes/bug8377 |3 +++ src/common/address.c |3 ++- 2 files

[tor-commits] [tor/maint-0.2.3] Merge remote-tracking branch 'public/bug8377' into maint-0.2.3

2013-03-18 Thread nickm
commit ebb95d0f781e21a694a8de386ed0b75984b247d4 Merge: c6ca199 165b2c0 Author: Nick Mathewson Date: Mon Mar 18 15:27:50 2013 -0400 Merge remote-tracking branch 'public/bug8377' into maint-0.2.3 changes/bug8377 |3 +++ src/common/address.c |3 ++- src/test/test_addr.c | 36 +

[tor-commits] [tor/maint-0.2.3] Make sure that [::1] is recognized as a private address

2013-03-18 Thread nickm
commit b528aaef035213dee93663599dc46b1898ae3f8e Author: Nick Mathewson Date: Fri Mar 1 12:22:57 2013 -0500 Make sure that [::1] is recognized as a private address Fixes bug 8377; bugfix on 0.2.1.3-alpha. --- changes/bug8377 |3 +++ src/common/address.c |3 ++- 2 files

[tor-commits] [tor/maint-0.2.3] Add unit test for tor_addr_is_loopback

2013-03-18 Thread nickm
commit 165b2c0123f0ffb1f9507aaa31cdd536b91bccdf Author: Nick Mathewson Date: Fri Mar 1 12:40:41 2013 -0500 Add unit test for tor_addr_is_loopback --- src/test/test_addr.c | 36 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/src/test/t

[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4

2013-03-18 Thread nickm
commit 5959d1c10581399efb46eeb6c0de66547894ed65 Merge: 3f837d4 0164f16 Author: Nick Mathewson Date: Mon Mar 18 15:17:11 2013 -0400 Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4 changes/bug8273 |3 + changes/bug8435 |4 + src/or/config.c |1 + src/o

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

2013-03-18 Thread nickm
commit 67709398b6bb1cea68b8c2a0060b251e8dfa86ee Merge: 41cff47 5959d1c Author: Nick Mathewson Date: Mon Mar 18 15:18:56 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8273 |3 + changes/bug8435 |4 + src/or/config.c |1 + src/or/dirserv.c

[tor-commits] [tor/master] Improve comment for routers_with_measured_bw static var in dirserv.c

2013-03-18 Thread nickm
commit 0164f16f70d17da202c8085e620e9cf043eda0b3 Author: Andrea Shepard Date: Mon Mar 18 12:04:41 2013 -0700 Improve comment for routers_with_measured_bw static var in dirserv.c --- src/or/dirserv.c |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv

[tor-commits] [tor/master] Ignore advertised bandwidths if we have enough measured bandwidths available

2013-03-18 Thread nickm
commit f93f7e331be94114d82c17108e741eb2482e6bda Author: Andrea Shepard Date: Mon Mar 18 11:15:21 2013 -0700 Ignore advertised bandwidths if we have enough measured bandwidths available --- changes/bug8435 |4 ++ src/or/config.c |1 + src/or/dirserv.c | 97 ++

[tor-commits] [tor/master] Improve comment on router_counts_toward_thresholds()

2013-03-18 Thread nickm
commit e9bdb695e82320fd320ba7e9c716ebdc51bfdeb0 Author: Andrea Shepard Date: Mon Mar 18 11:58:30 2013 -0700 Improve comment on router_counts_toward_thresholds() --- src/or/dirserv.c |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirse

[tor-commits] [tor/master] Better comment for dirserv_query_measured_bw_cache()

2013-03-18 Thread nickm
commit 8027ebb5fdf43b5aa63e498c1f8e3c6b2c87bbb7 Author: Andrea Shepard Date: Thu Mar 7 15:59:30 2013 -0800 Better comment for dirserv_query_measured_bw_cache() --- src/or/dirserv.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.

[tor-commits] [tor/master] Add dirserv_has_measured_bw() predicate wrapper for dirserv_query_measured_bw_cache()

2013-03-18 Thread nickm
commit d64e5969f470a18fe15a6a2863cf4b2b59b1bd27 Author: Andrea Shepard Date: Mon Mar 18 11:56:42 2013 -0700 Add dirserv_has_measured_bw() predicate wrapper for dirserv_query_measured_bw_cache() --- src/or/dirserv.c | 13 + src/or/dirserv.h |1 + 2 files changed, 10 inser

[tor-commits] [tor/master] Use DIGESTMAP_FOREACH_MODIFY in dirserv_expire_measured_bw_cache() for concision

2013-03-18 Thread nickm
commit b5224348340238f231f81138c09f7f16541d0f1d Author: Andrea Shepard Date: Thu Mar 7 15:55:01 2013 -0800 Use DIGESTMAP_FOREACH_MODIFY in dirserv_expire_measured_bw_cache() for concision --- src/or/dirserv.c | 35 ++- 1 files changed, 6 insertions(+), 29

[tor-commits] [tor/master] Add unit test for dirserv measured bandwidth cache

2013-03-18 Thread nickm
commit 6e978ab8294eda5bb9a658c8d062bdd0098a9ac5 Author: Andrea Shepard Date: Thu Mar 7 15:41:22 2013 -0800 Add unit test for dirserv measured bandwidth cache --- src/or/dirserv.c| 20 +++-- src/or/dirserv.h| 12 src/test/test_dir.c | 78 ++

[tor-commits] [tor/master] More constness in dirserv.c

2013-03-18 Thread nickm
commit c7947619df826f6c4568c857178d54b8dee17749 Author: Andrea Shepard Date: Thu Mar 7 05:05:56 2013 -0800 More constness in dirserv.c --- src/or/dirserv.c |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 1160f6b..184

[tor-commits] [tor/master] Make sure expiry check in dirserv_expire_measured_bw_cache() works if time_t is unsigned

2013-03-18 Thread nickm
commit 302d1dae6c468fd2bd5551de654e36b8464a7eab Author: Andrea Shepard Date: Thu Mar 7 05:10:54 2013 -0800 Make sure expiry check in dirserv_expire_measured_bw_cache() works if time_t is unsigned --- src/or/dirserv.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git

[tor-commits] [tor/master] Make dirserv_cache_measured_bw() use a const measured_bw_line_t *

2013-03-18 Thread nickm
commit 75eb79a6aa4ab46ddd6bd5f9c1d7567f80ace68c Author: Andrea Shepard Date: Thu Mar 7 03:42:14 2013 -0800 Make dirserv_cache_measured_bw() use a const measured_bw_line_t * --- src/or/dirserv.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/

[tor-commits] [tor/master] Call dirserv_clear_measured_bw_cache() from dirserv_free_all()

2013-03-18 Thread nickm
commit 0efe96cae81a078301ba8806d821175c830627b9 Author: Andrea Shepard Date: Tue Mar 5 13:11:43 2013 -0800 Call dirserv_clear_measured_bw_cache() from dirserv_free_all() --- src/or/dirserv.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/dirserv.c b/src/or

[tor-commits] [tor/master] Prefer measured bandwidths over advertised when computing things for votes on a dirauth

2013-03-18 Thread nickm
commit b5a164bde4f33fdd33c83a8425c6464c0f5ef60d Author: Andrea Shepard Date: Wed Feb 27 19:43:50 2013 -0800 Prefer measured bandwidths over advertised when computing things for votes on a dirauth --- changes/bug8273 |3 + src/or/dirserv.c | 206 ++

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4

2013-03-18 Thread nickm
commit 5959d1c10581399efb46eeb6c0de66547894ed65 Merge: 3f837d4 0164f16 Author: Nick Mathewson Date: Mon Mar 18 15:17:11 2013 -0400 Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4 changes/bug8273 |3 + changes/bug8435 |4 + src/or/config.c |1 + src/o

[tor-commits] [tor/maint-0.2.4] Improve comment for routers_with_measured_bw static var in dirserv.c

2013-03-18 Thread nickm
commit 0164f16f70d17da202c8085e620e9cf043eda0b3 Author: Andrea Shepard Date: Mon Mar 18 12:04:41 2013 -0700 Improve comment for routers_with_measured_bw static var in dirserv.c --- src/or/dirserv.c |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv

[tor-commits] [tor/maint-0.2.4] Add dirserv_has_measured_bw() predicate wrapper for dirserv_query_measured_bw_cache()

2013-03-18 Thread nickm
commit d64e5969f470a18fe15a6a2863cf4b2b59b1bd27 Author: Andrea Shepard Date: Mon Mar 18 11:56:42 2013 -0700 Add dirserv_has_measured_bw() predicate wrapper for dirserv_query_measured_bw_cache() --- src/or/dirserv.c | 13 + src/or/dirserv.h |1 + 2 files changed, 10 inser

[tor-commits] [tor/maint-0.2.4] Improve comment on router_counts_toward_thresholds()

2013-03-18 Thread nickm
commit e9bdb695e82320fd320ba7e9c716ebdc51bfdeb0 Author: Andrea Shepard Date: Mon Mar 18 11:58:30 2013 -0700 Improve comment on router_counts_toward_thresholds() --- src/or/dirserv.c |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirse

[tor-commits] [tor/maint-0.2.4] Ignore advertised bandwidths if we have enough measured bandwidths available

2013-03-18 Thread nickm
commit f93f7e331be94114d82c17108e741eb2482e6bda Author: Andrea Shepard Date: Mon Mar 18 11:15:21 2013 -0700 Ignore advertised bandwidths if we have enough measured bandwidths available --- changes/bug8435 |4 ++ src/or/config.c |1 + src/or/dirserv.c | 97 ++

[tor-commits] [tor/maint-0.2.4] Add unit test for dirserv measured bandwidth cache

2013-03-18 Thread nickm
commit 6e978ab8294eda5bb9a658c8d062bdd0098a9ac5 Author: Andrea Shepard Date: Thu Mar 7 15:41:22 2013 -0800 Add unit test for dirserv measured bandwidth cache --- src/or/dirserv.c| 20 +++-- src/or/dirserv.h| 12 src/test/test_dir.c | 78 ++

[tor-commits] [tor/maint-0.2.4] Better comment for dirserv_query_measured_bw_cache()

2013-03-18 Thread nickm
commit 8027ebb5fdf43b5aa63e498c1f8e3c6b2c87bbb7 Author: Andrea Shepard Date: Thu Mar 7 15:59:30 2013 -0800 Better comment for dirserv_query_measured_bw_cache() --- src/or/dirserv.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.

[tor-commits] [tor/maint-0.2.4] Use DIGESTMAP_FOREACH_MODIFY in dirserv_expire_measured_bw_cache() for concision

2013-03-18 Thread nickm
commit b5224348340238f231f81138c09f7f16541d0f1d Author: Andrea Shepard Date: Thu Mar 7 15:55:01 2013 -0800 Use DIGESTMAP_FOREACH_MODIFY in dirserv_expire_measured_bw_cache() for concision --- src/or/dirserv.c | 35 ++- 1 files changed, 6 insertions(+), 29

[tor-commits] [tor/maint-0.2.4] Make sure expiry check in dirserv_expire_measured_bw_cache() works if time_t is unsigned

2013-03-18 Thread nickm
commit 302d1dae6c468fd2bd5551de654e36b8464a7eab Author: Andrea Shepard Date: Thu Mar 7 05:10:54 2013 -0800 Make sure expiry check in dirserv_expire_measured_bw_cache() works if time_t is unsigned --- src/or/dirserv.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.4] Make dirserv_cache_measured_bw() use a const measured_bw_line_t *

2013-03-18 Thread nickm
commit 75eb79a6aa4ab46ddd6bd5f9c1d7567f80ace68c Author: Andrea Shepard Date: Thu Mar 7 03:42:14 2013 -0800 Make dirserv_cache_measured_bw() use a const measured_bw_line_t * --- src/or/dirserv.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/

[tor-commits] [tor/maint-0.2.4] More constness in dirserv.c

2013-03-18 Thread nickm
commit c7947619df826f6c4568c857178d54b8dee17749 Author: Andrea Shepard Date: Thu Mar 7 05:05:56 2013 -0800 More constness in dirserv.c --- src/or/dirserv.c |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 1160f6b..184

[tor-commits] [tor/maint-0.2.4] Prefer measured bandwidths over advertised when computing things for votes on a dirauth

2013-03-18 Thread nickm
commit b5a164bde4f33fdd33c83a8425c6464c0f5ef60d Author: Andrea Shepard Date: Wed Feb 27 19:43:50 2013 -0800 Prefer measured bandwidths over advertised when computing things for votes on a dirauth --- changes/bug8273 |3 + src/or/dirserv.c | 206 ++

[tor-commits] [tor/maint-0.2.4] Call dirserv_clear_measured_bw_cache() from dirserv_free_all()

2013-03-18 Thread nickm
commit 0efe96cae81a078301ba8806d821175c830627b9 Author: Andrea Shepard Date: Tue Mar 5 13:11:43 2013 -0800 Call dirserv_clear_measured_bw_cache() from dirserv_free_all() --- src/or/dirserv.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/dirserv.c b/src/or

[tor-commits] [tor/master] Make stream events for RESOLVE lookups more consistent

2013-03-18 Thread nickm
commit 3f837d4826cce0e7917e79d73b81aefc3fefc6bd Author: Nick Mathewson Date: Mon Mar 18 15:13:59 2013 -0400 Make stream events for RESOLVE lookups more consistent Fixes 8203; patch by Desoxy --- changes/bug8203 |4 src/or/connection_edge.c | 15 +--

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

2013-03-18 Thread nickm
commit 41cff47c6a9807d278fcde75c7dc04da876fb556 Merge: 617d71a 3f837d4 Author: Nick Mathewson Date: Mon Mar 18 15:16:11 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8203 |4 src/or/connection_edge.c | 15 +-- src/or/control.c

[tor-commits] [tor/maint-0.2.4] Make stream events for RESOLVE lookups more consistent

2013-03-18 Thread nickm
commit 3f837d4826cce0e7917e79d73b81aefc3fefc6bd Author: Nick Mathewson Date: Mon Mar 18 15:13:59 2013 -0400 Make stream events for RESOLVE lookups more consistent Fixes 8203; patch by Desoxy --- changes/bug8203 |4 src/or/connection_edge.c | 15 +--

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

2013-03-18 Thread nickm
commit 617d71a63948cbd60fa68e592fdd875aa63832e1 Merge: f15d9cf 7e9b6a1 Author: Nick Mathewson Date: Mon Mar 18 15:07:17 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8290 |9 + contrib/include.am |3 --- contrib/tor-tsocks.conf | 13

[tor-commits] [tor/master] Remove some lingering tsocks cruft.

2013-03-18 Thread nickm
commit 4740d2e8bcf72cc92bae72762ccae904015b9b2f Author: Nick Mathewson Date: Wed Feb 27 19:38:32 2013 -0500 Remove some lingering tsocks cruft. Now the manpages no longer refer to tsocks or tsocks.conf, and we no longer have or ship a tor-tsocks.conf. The only remaining instan

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug8290' into maint-0.2.4

2013-03-18 Thread nickm
commit 7e9b6a19d4cdc605039f4e0107cbd5f4781fe150 Merge: 26639b7 4740d2e Author: Nick Mathewson Date: Mon Mar 18 15:07:02 2013 -0400 Merge remote-tracking branch 'public/bug8290' into maint-0.2.4 changes/bug8290 |9 + contrib/include.am |3 --- contrib/tor-tsock

[tor-commits] [tor/maint-0.2.4] Remove some lingering tsocks cruft.

2013-03-18 Thread nickm
commit 4740d2e8bcf72cc92bae72762ccae904015b9b2f Author: Nick Mathewson Date: Wed Feb 27 19:38:32 2013 -0500 Remove some lingering tsocks cruft. Now the manpages no longer refer to tsocks or tsocks.conf, and we no longer have or ship a tor-tsocks.conf. The only remaining instan

[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8290' into maint-0.2.4

2013-03-18 Thread nickm
commit 7e9b6a19d4cdc605039f4e0107cbd5f4781fe150 Merge: 26639b7 4740d2e Author: Nick Mathewson Date: Mon Mar 18 15:07:02 2013 -0400 Merge remote-tracking branch 'public/bug8290' into maint-0.2.4 changes/bug8290 |9 + contrib/include.am |3 --- contrib/tor-tsock

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

2013-03-18 Thread nickm
commit f15d9cf5db290f4e1c9ee80214674414238eabff Merge: 1512747 26639b7 Author: Nick Mathewson Date: Mon Mar 18 14:50:36 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8231 |5 + src/or/circuitbuild.c |1 + src/or/entrynodes.c | 31 +++

[tor-commits] [tor/master] Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4

2013-03-18 Thread nickm
commit 26639b7798b5f5dae93e40bd7d050cb218a8aad2 Merge: 173efa1 4409531 Author: Nick Mathewson Date: Mon Mar 18 14:50:01 2013 -0400 Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4 changes/bug8231 |5 + src/or/circuitbuild.c |1 + src/or/entrynodes.c

  1   2   >