[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/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] 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/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] [torsocks/master] Replace Makefile.cvs with autogen.sh

2011-02-22 Thread hoganrobert
commit 3205b8fd332024bb693df84af6511a804b39bb4a Author: Robert Hogan rob...@roberthogan.net Date: Tue Feb 22 19:13:09 2011 + Replace Makefile.cvs with autogen.sh There, that wasn't so hard - was it. Autogen.sh stolen from tor. --- Makefile.cvs |8 autogen.sh |

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

2011-02-22 Thread arma
commit 108f48dfc7f1b6bdace9b859e01dbab79aeff071 Merge: 2eadbd4 4f730e4 Author: Roger Dingledine a...@torproject.org Date: Tue Feb 22 14:44:32 2011 -0500 Merge branch 'maint-0.2.2' doc/spec/README |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

[tor-commits] r24254: {website} karen noticed we were duplicating the first how tor works (website/trunk/about/en)

2011-02-22 Thread Roger Dingledine
Author: arma Date: 2011-02-22 20:08:33 + (Tue, 22 Feb 2011) New Revision: 24254 Modified: website/trunk/about/en/overview.wml Log: karen noticed we were duplicating the first how tor works picture on our overview page. Modified: website/trunk/about/en/overview.wml

[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 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/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/release-0.2.1] Simplest fix to bug2402: do not include SVN versions

2011-02-22 Thread arma
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