[tor-commits] [metrics-web/master] Don't smush the labels together!

commit cb1b41de3257c7289c695d2f2b41c77c46b8cfbe Author: Karsten Loesing karsten.loes...@gmx.net Date: Mon May 30 09:36:46 2011 +0200 Don't smush the labels together! --- rserve/graphs.R | 176 +++--- 1 files changed, 101 insertions(+), 75

[tor-commits] [obfsproxy/master] Revive unit tests accordingly (and also shove some unit test bugs under the rug)

commit 2153e2034f0214d023824bc2796efef036d64428 Author: George Kadianakis desnac...@gmail.com Date: Sun May 29 06:57:01 2011 +0200 Revive unit tests accordingly (and also shove some unit test bugs under the rug) --- src/test/unittest_obfs2.c | 92

[tor-commits] [obfsproxy/master] Send pending data right after init_crypto() is done.

commit f3636c411cb1e2ee9a5ffe5854d9b59259ff6b77 Author: George Kadianakis desnac...@gmail.com Date: Sun May 29 06:55:44 2011 +0200 Send pending data right after init_crypto() is done. --- src/network.c | 11 +-- src/network.h | 16

[tor-commits] [obfsproxy/master] Kill some more redundant casts

commit 1ee9c960c8fd5554369daa9f6606a875e38eda23 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 10:43:20 2011 -0400 Kill some more redundant casts --- src/protocols/dummy.c |4 ++-- src/test/unittest_obfs2.c | 24 2 files changed, 14

[tor-commits] [tor/maint-0.2.2] Use the normal four-hop CBT for client intro circuits

commit 8fc02a8e0ca431e4b61e54ed0aa10e7f0215c340 Author: Robert Ransom rransom.8...@gmail.com Date: Sun May 29 08:21:43 2011 -0700 Use the normal four-hop CBT for client intro circuits Fixes another part of bug 1297. --- changes/bug1297a|8 src/or/circuituse.c |

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

commit 16cfca501ff27dd11daa9dc75ba9f5d99c48bdf5 Merge: 5f182ea 8fc02a8 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 12:25:07 2011 -0400 Merge branch 'bug1297a' into maint-0.2.2 changes/bug1297a| 16 src/or/circuituse.c | 11 --- src/or/or.h

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

commit 4b57ec6e5eabb822506416bc5cf0e291ff9c0053 Merge: 6917728 16cfca5 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 12:33:54 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/circuituse.c changes/bug1297a| 16

[tor-commits] [tor/maint-0.2.2] Reinit keys at the start of options_act().

commit f08f0e9dde8e8910de5dc42d567629ff410c52f4 Author: Nick Mathewson ni...@torproject.org Date: Mon May 23 16:38:35 2011 -0400 Reinit keys at the start of options_act(). Previously we did this nearer to the end (in the old_options transition_affects_workers() block). But

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

commit 6802499413f8efd98ad4d578e5ef937cb55c1edc Merge: 16cfca5 f08f0e9 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 12:42:08 2011 -0400 Merge branch 'bug3228_squashed' into maint-0.2.2 changes/bug3228 |3 +++ src/or/config.c | 23 +++ 2 files

[tor-commits] [tor/master] Reinit keys at the start of options_act().

commit f08f0e9dde8e8910de5dc42d567629ff410c52f4 Author: Nick Mathewson ni...@torproject.org Date: Mon May 23 16:38:35 2011 -0400 Reinit keys at the start of options_act(). Previously we did this nearer to the end (in the old_options transition_affects_workers() block). But

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

commit 5dc3c462dcf42488055685e7f4fdb4a1a48003f1 Merge: 4b57ec6 6802499 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 12:43:25 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3228 |3 +++ src/or/config.c | 23 +++ 2 files

[tor-commits] [tor/maint-0.2.2] Use a 64-bit type to hold sockets on win64.

commit cfeafe5e77c9dd5587b1ec553eb1065f0bf841fd Author: Nick Mathewson ni...@torproject.org Date: Mon May 23 00:17:48 2011 -0400 Use a 64-bit type to hold sockets on win64. On win64, sockets are of type UINT_PTR; on win32 they're u_int; elsewhere they're int. The correct

[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'public/bug3270' into maint-0.2.2

commit da7c60dcf310fb9914bfd1b84a34b440ab04900a Merge: 6802499 cfeafe5 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 14:49:49 2011 -0400 Merge remote-tracking branch 'public/bug3270' into maint-0.2.2 changes/bug3270 |4 +++ src/common/compat.c |

[tor-commits] [tor/master] Use a 64-bit type to hold sockets on win64.

commit cfeafe5e77c9dd5587b1ec553eb1065f0bf841fd Author: Nick Mathewson ni...@torproject.org Date: Mon May 23 00:17:48 2011 -0400 Use a 64-bit type to hold sockets on win64. On win64, sockets are of type UINT_PTR; on win32 they're u_int; elsewhere they're int. The correct

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3270' into maint-0.2.2

commit da7c60dcf310fb9914bfd1b84a34b440ab04900a Merge: 6802499 cfeafe5 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 14:49:49 2011 -0400 Merge remote-tracking branch 'public/bug3270' into maint-0.2.2 changes/bug3270 |4 +++ src/common/compat.c |

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

commit 21de9d46e264ceb14f3fe59d17210d82f2499637 Merge: 5dc3c46 da7c60d Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 14:58:26 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/common/compat.c src/or/main.c changes/bug3270

[tor-commits] [tor/maint-0.2.2] changes file for bug3045

commit b6eee716a88cba0d0ae4be4e542f61b2d300ecec Author: Nick Mathewson ni...@torproject.org Date: Sun May 15 22:02:24 2011 -0400 changes file for bug3045 --- changes/bug3045 |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug3045 b/changes/bug3045 new

[tor-commits] [tor/maint-0.2.2] Log descriptions of nodes, not just nicknames.

commit b95dd03e5f6505ce2e78fe34a20bf5e5c970e6eb Author: Nick Mathewson ni...@torproject.org Date: Sun May 15 21:58:46 2011 -0400 Log descriptions of nodes, not just nicknames. This patch introduces a few new functions in router.c to produce a more helpful description of a node

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

commit 7e67a240381c76b8d18dab862256b73c72d2711f Merge: da7c60d 3c0d944 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 15:18:59 2011 -0400 Merge branch 'bug3045' into maint-0.2.2 Conflicts: src/or/circuitbuild.c changes/bug3045 |6 ++

[tor-commits] [tor/maint-0.2.2] whitespace fixes

commit 7f0fb8e6083128ff20b30d8cd29c220e9427d95e Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 15:21:06 2011 -0400 whitespace fixes --- src/common/compat_libevent.h |5 + src/common/util.h|2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff

[tor-commits] [tor/maint-0.2.2] minor cleanups while reviewing 3216

commit f118dc80e0ef2eeb62ae52ed107af3384e2a1afd Author: Roger Dingledine a...@torproject.org Date: Mon May 30 15:31:06 2011 -0400 minor cleanups while reviewing 3216 --- src/or/config.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/config.c

[tor-commits] [tor/master] Log descriptions of nodes, not just nicknames.

commit b95dd03e5f6505ce2e78fe34a20bf5e5c970e6eb Author: Nick Mathewson ni...@torproject.org Date: Sun May 15 21:58:46 2011 -0400 Log descriptions of nodes, not just nicknames. This patch introduces a few new functions in router.c to produce a more helpful description of a node

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

commit 7e67a240381c76b8d18dab862256b73c72d2711f Merge: da7c60d 3c0d944 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 15:18:59 2011 -0400 Merge branch 'bug3045' into maint-0.2.2 Conflicts: src/or/circuitbuild.c changes/bug3045 |6 ++

[tor-commits] [tor/master] Improve comments and defensive programming for 3045

commit 3c0d944b076aa552216ca598a6cdc50e77ad1a58 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 15:15:10 2011 -0400 Improve comments and defensive programming for 3045 The comment fixes are trivial. The defensive programming trick is to tolerate receiving NULL

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

commit 7f0fb8e6083128ff20b30d8cd29c220e9427d95e Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 15:21:06 2011 -0400 whitespace fixes --- src/common/compat_libevent.h |5 + src/common/util.h|2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff

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

commit fa1d47293b62fd378a7e43cf3ce3e7bb3be884e3 Merge: 21de9d4 7f0fb8e Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 15:41:46 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' The conflicts were mainly caused by the routerinfo-node transition.

[tor-commits] [tor/maint-0.2.2] Warn when two hs use the same directory

commit ca538290af507833c7cd5df7f663507c3540448d Author: Sebastian Hahn sebast...@torproject.org Date: Sun May 29 00:54:59 2011 +0200 Warn when two hs use the same directory This simple implementation has a few issues, but it should do for 0.2.2.x. We will want to revisit this

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

commit d35a555348dfccb19d7534af24d3c364372d515b Merge: f118dc8 ca53829 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 15:50:35 2011 -0400 Merge branch 'bug3289' into maint-0.2.2 changes/bug3289 |5 + src/or/rendservice.c | 25 + 2 files

[tor-commits] [tor/master] minor cleanups while reviewing 3216

commit f118dc80e0ef2eeb62ae52ed107af3384e2a1afd Author: Roger Dingledine a...@torproject.org Date: Mon May 30 15:31:06 2011 -0400 minor cleanups while reviewing 3216 --- src/or/config.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/config.c

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

commit e035cea0318add5cf8ed8d8f1c518a26434cbeda Merge: d35a555 0e1fad6 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 16:12:53 2011 -0400 Merge branch 'bug3216_v2' into maint-0.2.2 changes/bug3216 |4 src/or/connection.c | 26 +++---

[tor-commits] [tor/master] Don't build descriptors if ORPort auto is set and we have no OR listener

commit 95ac3ea5946f723ddab474fe229a872669aee47f Author: Nick Mathewson ni...@torproject.org Date: Tue May 17 21:42:35 2011 -0400 Don't build descriptors if ORPort auto is set and we have no OR listener This situation can happen easily if you set 'ORPort auto' and

[tor-commits] [tor/release-0.2.2] changes file for bug3045

commit b6eee716a88cba0d0ae4be4e542f61b2d300ecec Author: Nick Mathewson ni...@torproject.org Date: Sun May 15 22:02:24 2011 -0400 changes file for bug3045 --- changes/bug3045 |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/bug3045 b/changes/bug3045 new

[tor-commits] [tor/release-0.2.2] Use a 64-bit type to hold sockets on win64.

commit cfeafe5e77c9dd5587b1ec553eb1065f0bf841fd Author: Nick Mathewson ni...@torproject.org Date: Mon May 23 00:17:48 2011 -0400 Use a 64-bit type to hold sockets on win64. On win64, sockets are of type UINT_PTR; on win32 they're u_int; elsewhere they're int. The correct

[tor-commits] [tor/release-0.2.2] Don't try to build descriptors when router_get_advertised_or_port()==0

commit 0e1fad648d22923d7455b94734df36585b8f624f Author: Nick Mathewson ni...@torproject.org Date: Tue May 24 11:55:08 2011 -0400 Don't try to build descriptors when router_get_advertised_or_port()==0 The previous attempt was incomplete: it told us not to publish a descriptor,

[tor-commits] [tor/release-0.2.2] Set timestamp_dirty on HS circuits as circuit_expire_building requires

commit 112d204fadab74426cc802e6d998a53f938a5248 Author: Robert Ransom rransom.8...@gmail.com Date: Sun May 29 08:03:41 2011 -0700 Set timestamp_dirty on HS circuits as circuit_expire_building requires Fixes part of #1297; bugfix on 48e0228f1e031a709c1deb149c7dfd187c3609cf, when

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

commit 16cfca501ff27dd11daa9dc75ba9f5d99c48bdf5 Merge: 5f182ea 8fc02a8 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 12:25:07 2011 -0400 Merge branch 'bug1297a' into maint-0.2.2 changes/bug1297a| 16 src/or/circuituse.c | 11 --- src/or/or.h

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

commit 6802499413f8efd98ad4d578e5ef937cb55c1edc Merge: 16cfca5 f08f0e9 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 12:42:08 2011 -0400 Merge branch 'bug3228_squashed' into maint-0.2.2 changes/bug3228 |3 +++ src/or/config.c | 23 +++ 2 files

[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'public/bug3270' into maint-0.2.2

commit da7c60dcf310fb9914bfd1b84a34b440ab04900a Merge: 6802499 cfeafe5 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 14:49:49 2011 -0400 Merge remote-tracking branch 'public/bug3270' into maint-0.2.2 changes/bug3270 |4 +++ src/common/compat.c |

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

commit d35a555348dfccb19d7534af24d3c364372d515b Merge: f118dc8 ca53829 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 15:50:35 2011 -0400 Merge branch 'bug3289' into maint-0.2.2 changes/bug3289 |5 + src/or/rendservice.c | 25 + 2 files

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

commit 7e67a240381c76b8d18dab862256b73c72d2711f Merge: da7c60d 3c0d944 Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 15:18:59 2011 -0400 Merge branch 'bug3045' into maint-0.2.2 Conflicts: src/or/circuitbuild.c changes/bug3045 |6 ++

[tor-commits] [tor/release-0.2.2] whitespace fixes

commit 7f0fb8e6083128ff20b30d8cd29c220e9427d95e Author: Nick Mathewson ni...@torproject.org Date: Mon May 30 15:21:06 2011 -0400 whitespace fixes --- src/common/compat_libevent.h |5 + src/common/util.h|2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff

[tor-commits] [tor/release-0.2.2] fold in some more changes entries

commit 66732b764b7a787e48ad2b5ac972595145dfaf28 Author: Roger Dingledine a...@torproject.org Date: Mon May 30 21:03:14 2011 -0400 fold in some more changes entries --- ChangeLog| 26 ++ changes/bug1297a | 16 changes/bug3045 |6