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

2011-02-22 Thread nickm
commit 933ffd536daf5b00e1ddcb517b2e4e73f2bcb286 Merge: ce4f879 613073e Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 12:47:47 2011 -0500 Merge remote branch 'origin/maint-0.2.2' changes/bug2504 |5 + src/common/compat.c |2 +- 2 files changed, 6

[tor-commits] [tor/maint-0.2.2] Add manpage entry for logging domains

2011-02-22 Thread nickm
commit 23f8bedddb1b3497ea8bbafef90ae24893be9a9e Author: Nick Mathewson ni...@torproject.org Date: Tue Jan 25 15:02:36 2011 -0500 Add manpage entry for logging domains Fixes issue 2215. --- changes/log_domains |5 + doc/tor.1.txt | 23 +++ 2

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

2011-02-22 Thread nickm
commit 9d5873cdaedf5bbae50bec08bb0719a1a5be403d Merge: 613073e ce149c1 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 13:01:02 2011 -0500 Merge branch 'log_domains' into maint-0.2.2 changes/log_domains | 12 +++ doc/tor.1.txt | 28 +++

[tor-commits] [tor/master] Add manpage entry for logging domains

2011-02-22 Thread nickm
commit 23f8bedddb1b3497ea8bbafef90ae24893be9a9e Author: Nick Mathewson ni...@torproject.org Date: Tue Jan 25 15:02:36 2011 -0500 Add manpage entry for logging domains Fixes issue 2215. --- changes/log_domains |5 + doc/tor.1.txt | 23 +++ 2

[tor-commits] [tor/master] Simplify syntax for negated log domains

2011-02-22 Thread nickm
commit e261a1a3e6513eeafa1b53b83ebfec7f5d834a39 Author: Nick Mathewson ni...@torproject.org Date: Tue Jan 25 15:03:36 2011 -0500 Simplify syntax for negated log domains Previously if you wanted to say All messages except network messages, you needed to say [*,~net] and if you

[tor-commits] [tor/master] Add a torrc option to report log domains

2011-02-22 Thread nickm
commit 89ee779f928af4ad31ad6d45936c6a386e263584 Author: Nick Mathewson ni...@torproject.org Date: Tue Jan 25 15:53:15 2011 -0500 Add a torrc option to report log domains --- changes/log_domains |3 ++ doc/tor.1.txt |5 +++ src/common/log.c| 76

[tor-commits] [tor/master] Thou shalt not overflow even stupidly small buffers

2011-02-22 Thread nickm
commit 0ab8b7c0f22bd45d7108ce0185e027cd8e469593 Author: Robert Ransom rransom.8...@gmail.com Date: Fri Feb 4 05:50:44 2011 -0800 Thou shalt not overflow even stupidly small buffers --- src/common/log.c | 10 ++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git

[tor-commits] [tor/master] That shalt also not have a label without a statement.

2011-02-22 Thread nickm
commit ce149c10227bd4d65bfa62898e729430981328c1 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 12:52:52 2011 -0500 That shalt also not have a label without a statement. --- src/common/log.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.2] Don't let bad DNS make exit policy and declared exit policy get out of sync

2011-02-22 Thread nickm
commit cdc59c198a15195a113d68b2c4fbb270792da533 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 14:06:28 2011 -0500 Don't let bad DNS make exit policy and declared exit policy get out of sync Patch from postman on trac. Fixes bg 2366. Bug on 0.1.2.5-alpha. ---

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

2011-02-22 Thread nickm
commit b7f201f74606aff1f77551449bebe8783a59733a Merge: 46b0746 cdc59c1 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 14:10:42 2011 -0500 Merge remote branch 'origin/maint-0.2.2' Conflicts: src/or/policies.c src/or/policies.h changes/bug2366 |8

[tor-commits] [tor/master] Merge remote branch 'sebastian/bug2496'

2011-02-22 Thread nickm
commit 2eadbd41f0d0356898c75d7fab032109a85bc9e9 Merge: b7f201f 7736f44 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 14:17:11 2011 -0500 Merge remote branch 'sebastian/bug2496' src/or/config.c | 14 -- 1 files changed, 8 insertions(+), 6 deletions(-) diff

[tor-commits] [tor/master] Don't tell Tor client users about missing geoip

2011-02-22 Thread nickm
commit 7736f44698798111be413ca3285a77ce1e4d6b0c Author: Sebastian Hahn sebast...@torproject.org Date: Sun Feb 6 00:25:33 2011 +0100 Don't tell Tor client users about missing geoip They don't need the geoip file for stats, so a missing geoipfile is not a big issue. Also make the

[tor-commits] [tor/maint-0.2.1] Simplest fix to bug2402: do not include SVN versions

2011-02-22 Thread nickm
commit a1073ee956021ead19d30c2151510dbaced416a8 Author: Nick Mathewson ni...@torproject.org Date: Tue Jan 25 14:08:13 2011 -0500 Simplest fix to bug2402: do not include SVN versions When we stopped using svn, 0.2.1.x lost the ability to notice its svn revision and report it in

[tor-commits] [tor/maint-0.2.1] Merge remote branch 'public/bug2402_nothing' into maint-0.2.1

2011-02-22 Thread nickm
commit 7605985b3ff71cee7fabdf023baf298b218d04c1 Merge: 372773d a1073ee Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 15:54:13 2011 -0500 Merge remote branch 'public/bug2402_nothing' into maint-0.2.1 changes/bug2402 |4 src/or/config.c | 11 +-- 2 files

[tor-commits] [tor/maint-0.2.2] changes file for removing torspec from the tarball

2011-02-22 Thread nickm
commit 372773d681ed0f67e824cf2eef41a7186ab6c458 Author: Roger Dingledine a...@torproject.org Date: Tue Feb 22 14:50:00 2011 -0500 changes file for removing torspec from the tarball --- changes/torspec.git |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.2] changes file for removing torspec from the tarball

2011-02-22 Thread nickm
commit e606f19fa369c7ad5934793cb4f72f97972b52bc Author: Roger Dingledine a...@torproject.org Date: Tue Feb 22 14:50:00 2011 -0500 changes file for removing torspec from the tarball --- changes/torspec.git |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git

[tor-commits] [tor/master] changes file for removing torspec from the tarball

2011-02-22 Thread nickm
commit e606f19fa369c7ad5934793cb4f72f97972b52bc Author: Roger Dingledine a...@torproject.org Date: Tue Feb 22 14:50:00 2011 -0500 changes file for removing torspec from the tarball --- changes/torspec.git |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.1] Issues with router_get_by_nickname()

2011-02-22 Thread nickm
commit 7488fe5a224bf1c40d22769ff3986361d947d6f7 Author: Robert Hogan rob...@roberthogan.net Date: Sun Oct 17 12:27:57 2010 +0100 Issues with router_get_by_nickname() https://trac.torproject.org/projects/tor/ticket/1859 Use router_get_by_digest() instead of

[tor-commits] [tor/maint-0.2.2] Fix a remaining bug in Robert's bug1859 fix.

2011-02-22 Thread nickm
commit 2392290c1887b732fd2309e57ce04ab71b9b4e69 Author: Nick Mathewson ni...@torproject.org Date: Thu Oct 21 11:08:15 2010 -0400 Fix a remaining bug in Robert's bug1859 fix. When intro-extend_info is created for an introduction point, it only starts out with a nickname, not

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

2011-02-22 Thread nickm
commit bbf782dc13915c579396d94efbdf87b5c32b70d3 Merge: 3d4c2ff 06deec1 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 17:21:34 2011 -0500 Merge remote branch 'origin/maint-0.2.2' ___ tor-commits mailing list

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

2011-02-22 Thread nickm
commit 06deec15c9ecb7c40e3f7f8e05be887ab0705877 Merge: e606f19 491abbc Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 17:20:55 2011 -0500 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 (This is an ours merge of the code for bug1859 backported to 0.2.1.)

[tor-commits] [tor/maint-0.2.2] Remove doc/spec/Makefile.in from list of generated files

2011-02-22 Thread nickm
commit 10ad3442e11fb5a54c19eef7425bc317a9cc0969 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 17:51:03 2011 -0500 Remove doc/spec/Makefile.in from list of generated files --- configure.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in

[tor-commits] [tor/master] Remove doc/spec/Makefile.in from list of generated files

2011-02-22 Thread nickm
commit 10ad3442e11fb5a54c19eef7425bc317a9cc0969 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 17:51:03 2011 -0500 Remove doc/spec/Makefile.in from list of generated files --- configure.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in

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

2011-02-22 Thread nickm
commit 596f7a39b69c5c3c5f2427e65056af6cc2bb0f64 Merge: 06deec1 10ad344 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 17:53:09 2011 -0500 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 Conflicts: configure.in configure.in |2 +- 1 files

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

2011-02-22 Thread nickm
commit c2f111a631292b38b25635334afd628cb1024265 Merge: bbf782d 596f7a3 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 17:55:17 2011 -0500 Merge remote branch 'origin/maint-0.2.2' Conflicts: configure.in configure.in |1 - 1 files changed, 0

[tor-commits] [tor/maint-0.2.2] Merge remote branch 'arma/bug2403' into maint-0.2.2

2011-02-22 Thread nickm
commit 16b8b9b00f414343030c29990930c0e52a01fd84 Merge: 530e87c a2727f6 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 18:38:03 2011 -0500 Merge remote branch 'arma/bug2403' into maint-0.2.2 changes/bug2403 |6 ++ src/or/circuitbuild.c |3 ++- 2 files

[tor-commits] [tor/master] prevent same entry and exit for insane edge case

2011-02-22 Thread nickm
commit a2727f62494b8a56152214017ac8fb348dd064be Author: Roger Dingledine a...@torproject.org Date: Tue Feb 22 17:54:25 2011 -0500 prevent same entry and exit for insane edge case --- changes/bug2403 |6 ++ src/or/circuitbuild.c |3 ++- 2 files changed, 8 insertions(+), 1

[tor-commits] [tor/master] Merge remote branch 'arma/bug2403' into maint-0.2.2

2011-02-22 Thread nickm
commit 16b8b9b00f414343030c29990930c0e52a01fd84 Merge: 530e87c a2727f6 Author: Nick Mathewson ni...@torproject.org Date: Tue Feb 22 18:38:03 2011 -0500 Merge remote branch 'arma/bug2403' into maint-0.2.2 changes/bug2403 |6 ++ src/or/circuitbuild.c |3 ++- 2 files

[tor-commits] [tor/master] Fix a couple of compile warnings on OS X 10.6

2011-02-24 Thread nickm
commit 303c04109b9044715c2f0b7e8cd9f18027ee7d5f Author: Sebastian Hahn sebast...@torproject.org Date: Thu Feb 24 07:19:09 2011 +0100 Fix a couple of compile warnings on OS X 10.6 --- src/or/status.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/status.c

[tor-commits] [tor/master] Merge remote branch 'sebastian/osx_compile'

2011-02-24 Thread nickm
commit feaa0120d0d08591d3c9e720438d8f2fc34ed736 Merge: 9265164 303c041 Author: Nick Mathewson ni...@torproject.org Date: Thu Feb 24 09:27:04 2011 -0500 Merge remote branch 'sebastian/osx_compile' src/or/status.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

[tor-commits] [tor/maint-0.2.2] Avoid spurious bwhist parsing failures

2011-03-01 Thread nickm
commit 6b7408178bf9cb3864cec14408d78e8374f26b68 Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 1 17:08:02 2011 -0500 Avoid spurious bwhist parsing failures This should fix a bug that special ran into, where if your state file didn't record period maxima, it would

[tor-commits] [tor/master] remove tls related hash table code

2011-03-01 Thread nickm
commit 49de5431d53b4515d48a0f1c76fc53f3306f5d11 Author: Gladys Shufflebottom Date: Sat Feb 19 22:01:42 2011 -0500 remove tls related hash table code --- changes/tls-hash|3 +++ src/common/tortls.c | 28 ++-- 2 files changed, 5 insertions(+), 26

[tor-commits] [torspec/master] Move xxx-bridge-disbursement to ideas/old: bridgedb spec supersedes it.

2011-03-01 Thread nickm
a distinct address to match an + existing one. IOW, if we treat nickm@X and nickm@Y as the same + user, then anybody can register nickm@Z and use it to tell which + bridges nickm@X got (or would get). + + Make sure that we actually check headers so we can't be trivially + used

[tor-commits] [torspec/master] Give torspec repo a .gitignore file

2011-03-01 Thread nickm
commit 1918d157879c6c1fa701b61e2930f9f9ab3af5c7 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 00:39:02 2011 -0500 Give torspec repo a .gitignore file --- proposals/.gitignore |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/proposals/.gitignore

[tor-commits] [torspec/master] Cautiously update status of proposals 149, 169, 174, 176, 177.

2011-03-01 Thread nickm
commit b0cd43c6afb6937b41b5caa69205d30ac8408bc2 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 00:53:24 2011 -0500 Cautiously update status of proposals 149,169,174,176,177. --- proposals/000-index.txt | 20 ++--

[tor-commits] [torspec/master] Add the start of an ipv6 issues document to proposals/ideas

2011-03-01 Thread nickm
commit dbc1039e3e19b577548f9fadf205ebd0d5d71f52 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 01:51:49 2011 -0500 Add the start of an ipv6 issues document to proposals/ideas One of the sponsors wanted this for March, I believe. --- proposals/ideas/xxx-ipv6-plan.txt |

[tor-commits] [torspec/master] Close proposal 166 and make xxx-geoip-survey-plan obsolete

2011-03-02 Thread nickm
commit 6501e1e80a6eb44aa1ff089ced2870b6728865a8 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 11:20:33 2011 -0500 Close proposal 166 and make xxx-geoip-survey-plan obsolete Karsten confirms that 166 is implemented, and xxx-geoip-survey-plan is superseded by this

[tor-commits] [torspec/master] Sebastian confirms that 178 should be Open

2011-03-02 Thread nickm
commit 304314dc6d0ec77887125ed7e34caf3d3ca49c09 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 11:25:44 2011 -0500 Sebastian confirms that 178 should be Open --- proposals/000-index.txt|4 ++-- proposals/178-param-voting.txt |2 +- 2 files changed, 3

[tor-commits] [torspec/master] tweak ipv6 plan more

2011-03-02 Thread nickm
commit 2fa1377bdc200cecd0c36ba4104f3da156ba1ea8 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 12:21:56 2011 -0500 tweak ipv6 plan more --- proposals/ideas/xxx-ipv6-plan.txt | 22 +++--- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git

[tor-commits] [torspec/master] ipv6-plan patch from ioerror

2011-03-02 Thread nickm
commit 2cb38a6ef43fd3b5de7508622a815d8810275e0b Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 11:29:41 2011 -0500 ipv6-plan patch from ioerror --- proposals/ideas/xxx-ipv6-plan.txt | 21 +++-- 1 files changed, 15 insertions(+), 6 deletions(-) diff --git

[tor-commits] [torspec/master] Clarify that circwindow overrides the default of 1000 in tor-spec too

2011-03-02 Thread nickm
commit 92fe1a5cbbd8477b381bbfc40d1fe2a41ee19d5f Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 3 00:00:15 2011 -0500 Clarify that circwindow overrides the default of 1000 in tor-spec too --- tor-spec.txt |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.2] Fix typo in man page

2011-03-03 Thread nickm
commit 88e0de9ebbb75a64d7870ccd8cf431bb0f23c937 Author: Robert Ransom rransom.8...@gmail.com Date: Thu Mar 3 10:41:39 2011 -0800 Fix typo in man page --- doc/tor.1.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index

[tor-commits] [tor/maint-0.2.2] Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2

2011-03-03 Thread nickm
commit 1d6af67ab8d96c30e022f1f7602276f10c8444dc Merge: 6b74081 88e0de9 Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 3 13:50:17 2011 -0500 Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2 doc/tor.1.txt |2 +- 1 files changed, 1 insertions(+), 1

[tor-commits] [tor/master] Remove now-unused helper functions

2011-03-03 Thread nickm
commit 13ee80346927c155b2cecc7859e14865c05bb5f8 Author: Robert Ransom rransom.8...@gmail.com Date: Thu Mar 3 14:59:21 2011 -0800 Remove now-unused helper functions These functions were needed only by code removed in the preceding commit. Reported by mobmix. ---

[tor-commits] [tor/master] Check the result of SSL_set_ex_data

2011-03-03 Thread nickm
commit 74fc993b98a98f57d257d2150b0a915b47356490 Author: Robert Ransom rransom.8...@gmail.com Date: Thu Mar 3 16:17:39 2011 -0800 Check the result of SSL_set_ex_data Reported by piebeer. --- src/common/tortls.c |9 - 1 files changed, 8 insertions(+), 1 deletions(-)

[tor-commits] [tor/master] Use SSL_*_ex_data instead of SSL_*_app_data

2011-03-03 Thread nickm
commit fe1137be6f0fc01d7dfda568134590ecb5627eb4 Author: Robert Ransom rransom.8...@gmail.com Date: Thu Mar 3 15:34:53 2011 -0800 Use SSL_*_ex_data instead of SSL_*_app_data SSL_*_app_data uses ex_data index 0, which will be the first one allocated by SSL_get_ex_new_index. Thus,

[tor-commits] [tor/master] Add a magic field to tor_tls_t to catch exdata corruption bugs, if any appear.

2011-03-03 Thread nickm
commit 8ae179deec203bc7127f7a0b326569ef11e78dc0 Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 3 23:41:34 2011 -0500 Add a magic field to tor_tls_t to catch exdata corruption bugs, if any appear. --- src/common/tortls.c | 11 ++- 1 files changed, 10 insertions(+), 1

[tor-commits] [tor/master] Fix typo in man page

2011-03-03 Thread nickm
commit 88e0de9ebbb75a64d7870ccd8cf431bb0f23c937 Author: Robert Ransom rransom.8...@gmail.com Date: Thu Mar 3 10:41:39 2011 -0800 Fix typo in man page --- doc/tor.1.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index

[tor-commits] [tor/master] Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2

2011-03-03 Thread nickm
commit 1d6af67ab8d96c30e022f1f7602276f10c8444dc Merge: 6b74081 88e0de9 Author: Nick Mathewson ni...@torproject.org Date: Thu Mar 3 13:50:17 2011 -0500 Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2 doc/tor.1.txt |2 +- 1 files changed, 1 insertions(+), 1

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

2011-03-03 Thread nickm
commit c6d8e75dc3aafe7b9a658221ac3bcd4a5936ff9b Merge: f608872 1d6af67 Author: Nick Mathewson ni...@torproject.org Date: Fri Mar 4 00:25:14 2011 -0500 Merge remote branch 'origin/maint-0.2.2' doc/tor.1.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --combined

[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] 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] 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.2] 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.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.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/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 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] 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] [bridgedb/master] Fix #2557: Don't crash if a distributor gets disabled.

2011-03-07 Thread nickm
commit c518422f708e5d059f3d77e882e1da04b38d30c1 Author: Christian Fromme ka...@strace.org Date: Sun Mar 6 14:19:27 2011 +0100 Fix #2557: Don't crash if a distributor gets disabled. --- lib/bridgedb/Bridges.py | 16 +--- lib/bridgedb/Bucket.py | 12

[tor-commits] [tor/maint-0.2.2] Fix connect() failures in get_interface_address6()

2011-03-07 Thread nickm
commit 865ea5d26361802d53c586d27f249e5c2e924538 Author: Sebastian Hahn sebast...@torproject.org Date: Sat Mar 5 14:46:32 2011 +0100 Fix connect() failures in get_interface_address6() The third argument for connect should be dependent on the address family. Issue spotted by

[tor-commits] [tor/maint-0.2.2] Fix setting target port in get_interface_address6

2011-03-07 Thread nickm
commit f83debb51d7fa4a1827967d8bea145636c855f89 Author: Sebastian Hahn sebast...@torproject.org Date: Sat Mar 5 15:20:55 2011 +0100 Fix setting target port in get_interface_address6 We want to use the discard port correctly, so a htons() was missing. Also we need to set it

[tor-commits] [tor/maint-0.2.2] Merge remote branch 'sebastian/bug2660' into maint-0.2.2

2011-03-07 Thread nickm
commit 3bd83b8fb64c070210c589f65ed8cc023dd47077 Merge: 35fcec3 f83debb Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 7 17:09:23 2011 -0500 Merge remote branch 'sebastian/bug2660' into maint-0.2.2 changes/bug2660 |7 +++ src/common/address.c | 18

[tor-commits] [tor/master] Fix connect() failures in get_interface_address6()

2011-03-07 Thread nickm
commit 865ea5d26361802d53c586d27f249e5c2e924538 Author: Sebastian Hahn sebast...@torproject.org Date: Sat Mar 5 14:46:32 2011 +0100 Fix connect() failures in get_interface_address6() The third argument for connect should be dependent on the address family. Issue spotted by

[tor-commits] [tor/master] Fix setting target port in get_interface_address6

2011-03-07 Thread nickm
commit f83debb51d7fa4a1827967d8bea145636c855f89 Author: Sebastian Hahn sebast...@torproject.org Date: Sat Mar 5 15:20:55 2011 +0100 Fix setting target port in get_interface_address6 We want to use the discard port correctly, so a htons() was missing. Also we need to set it

[tor-commits] [tor/master] Merge remote branch 'sebastian/bug2660' into maint-0.2.2

2011-03-07 Thread nickm
commit 3bd83b8fb64c070210c589f65ed8cc023dd47077 Merge: 35fcec3 f83debb Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 7 17:09:23 2011 -0500 Merge remote branch 'sebastian/bug2660' into maint-0.2.2 changes/bug2660 |7 +++ src/common/address.c | 18

[tor-commits] [tor/maint-0.2.1] Avoid crash in any_pending_bridge_descriptor_fetches

2011-03-08 Thread nickm
commit 9a6df215395750286383eed77f3c49d2b3ef34df Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 8 15:17:41 2011 -0500 Avoid crash in any_pending_bridge_descriptor_fetches This is based on shitlei's fix for bug2629, with extra parens removed. Fixes bug 2629, bugfix on

[tor-commits] [tor/master] make nickm's proposed convention from 2003 be gospel

2011-03-08 Thread nickm
commit 95edd51116c17327f314bc132a0a5f86499e410a Author: Roger Dingledine a...@torproject.org Date: Tue Mar 8 14:59:30 2011 -0500 make nickm's proposed convention from 2003 be gospel --- doc/HACKING | 10 +- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git

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

2011-03-08 Thread nickm
commit d5907e7d9d79297cc7359aeae810972a1b834e23 Merge: 26009a3 9ad083d Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 8 15:23:30 2011 -0500 Merge remote branch 'origin/maint-0.2.2' changes/bug2629 |5 + doc/HACKING | 10 +-

[tor-commits] [tor/maint-0.2.2] Remove an incorrect comment in connection_or_check_valid_tls_handshake

2011-03-08 Thread nickm
commit 80357abb11023ff285c251ee75b864e0a27d5809 Author: Nick Mathewson ni...@torproject.org Date: Mon Nov 22 11:36:22 2010 -0500 Remove an incorrect comment in connection_or_check_valid_tls_handshake --- src/or/connection_or.c |3 --- 1 files changed, 0 insertions(+), 3 deletions(-)

[tor-commits] [tor/maint-0.2.2] Handle negative run lengths in wfu/mtbf calculations

2011-03-08 Thread nickm
commit 5a9903b9e09697ac131c841310dd82eebcca02e0 Author: Nick Mathewson ni...@torproject.org Date: Mon Nov 22 12:39:22 2010 -0500 Handle negative run lengths in wfu/mtbf calculations --- changes/bug1035 |5 + src/or/rephist.c | 22 +++--- 2 files changed, 20

[tor-commits] [tor/maint-0.2.2] Fix compile without warnings on OS X 10.6

2011-03-08 Thread nickm
commit 59a3d536d80d49da956d5e4e0c59a97164e1f9c4 Author: Sebastian Hahn sebast...@torproject.org Date: Mon Dec 27 11:37:16 2010 +0100 Fix compile without warnings on OS X 10.6 --- src/or/rephist.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/rephist.c

[tor-commits] [tor/maint-0.2.2] clarify an assert

2011-03-08 Thread nickm
commit 5a4f7fa1e48923730376c0a42121e4c3022eef3b Author: Sebastian Hahn sebast...@torproject.org Date: Sat Feb 26 09:42:44 2011 +0100 clarify an assert also log about running changes, even on a bridge authority. --- src/or/rephist.c | 11 +-- 1 files changed, 5

[tor-commits] [tor/master] Remove an incorrect comment in connection_or_check_valid_tls_handshake

2011-03-08 Thread nickm
commit 80357abb11023ff285c251ee75b864e0a27d5809 Author: Nick Mathewson ni...@torproject.org Date: Mon Nov 22 11:36:22 2010 -0500 Remove an incorrect comment in connection_or_check_valid_tls_handshake --- src/or/connection_or.c |3 --- 1 files changed, 0 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Treat routers whose IPs have changed as having been down for MTBF/routerinfo

2011-03-08 Thread nickm
commit bea0a31c1c859a563f065d8b868570560abc5135 Author: Nick Mathewson ni...@torproject.org Date: Mon Nov 22 12:30:33 2010 -0500 Treat routers whose IPs have changed as having been down for MTBF/routerinfo calculation purposes. --- changes/bug1035 |7 +++ src/or/dirserv.c |

[tor-commits] [tor/master] Handle negative run lengths in wfu/mtbf calculations

2011-03-08 Thread nickm
commit 5a9903b9e09697ac131c841310dd82eebcca02e0 Author: Nick Mathewson ni...@torproject.org Date: Mon Nov 22 12:39:22 2010 -0500 Handle negative run lengths in wfu/mtbf calculations --- changes/bug1035 |5 + src/or/rephist.c | 22 +++--- 2 files changed, 20

[tor-commits] [tor/master] Fix compile without warnings on OS X 10.6

2011-03-08 Thread nickm
commit 59a3d536d80d49da956d5e4e0c59a97164e1f9c4 Author: Sebastian Hahn sebast...@torproject.org Date: Mon Dec 27 11:37:16 2010 +0100 Fix compile without warnings on OS X 10.6 --- src/or/rephist.c |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/rephist.c

[tor-commits] [tor/master] Fix spelling and an unused #define

2011-03-08 Thread nickm
commit a68e2043aba4d33e39a8cb47be5dc3082f27ad07 Author: Sebastian Hahn sebast...@torproject.org Date: Mon Feb 7 16:15:02 2011 +0100 Fix spelling and an unused #define both noticed by rransom --- src/or/rephist.c |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff

[tor-commits] [tor/master] clarify an assert

2011-03-08 Thread nickm
commit 5a4f7fa1e48923730376c0a42121e4c3022eef3b Author: Sebastian Hahn sebast...@torproject.org Date: Sat Feb 26 09:42:44 2011 +0100 clarify an assert also log about running changes, even on a bridge authority. --- src/or/rephist.c | 11 +-- 1 files changed, 5

[tor-commits] [tor/master] Routers count as down when they change ORPort, too

2011-03-08 Thread nickm
commit 9b64227ffd38e9406c5c88ace137a0eae010771d Author: Sebastian Hahn sebast...@torproject.org Date: Mon Feb 7 16:31:20 2011 +0100 Routers count as down when they change ORPort, too rransom noticed that a change of ORPort is just as bad as a change of IP address from a

[tor-commits] [tor/master] update spec locations

2011-03-08 Thread nickm
commit 9c72324ae85c3f2cc23fee7d383128fa239b36d0 Author: Roger Dingledine a...@torproject.org Date: Tue Mar 8 15:31:04 2011 -0500 update spec locations --- doc/HACKING | 13 ++--- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index

[tor-commits] [tor/master] Merge remote branch 'sebastian/bug1035' into maint-0.2.2

2011-03-08 Thread nickm
commit 0d78a16c3642f7538266e007da79c39860aac332 Merge: 9c72324 5a4f7fa Author: Nick Mathewson ni...@torproject.org Date: Tue Mar 8 15:52:43 2011 -0500 Merge remote branch 'sebastian/bug1035' into maint-0.2.2 changes/bug1035| 13 + src/or/connection_or.c |3 --

  1   2   3   4   5   6   7   8   9   10   >