[tor-commits] [obfsproxy/master] Howto instructions for using Tor with obfsproxy.

2011-04-28 Thread nickm
commit 7123e54eb9bdbae3fe92d2284105a2fd1e2c5a0f Author: George Kadianakis desnac...@gmail.com Date: Thu Apr 28 09:56:09 2011 -0400 Howto instructions for using Tor with obfsproxy. --- doc/tor-obfs-howto.txt | 101 1 files changed, 101

[tor-commits] [tor/maint-0.2.1] Forget all rendezvous client state on SIGNAL NEWNYM

2011-04-28 Thread nickm
commit 440e48ddf27094e48c401c68c9014eca43b6867e Author: Robert Ransom rransom.8...@gmail.com Date: Wed Apr 20 02:27:58 2011 -0700 Forget all rendezvous client state on SIGNAL NEWNYM --- changes/forget-rend-descs-on-newnym |5 src/or/main.c |2 +

[tor-commits] [tor/master] Fix a bug introduced by purging rend_cache on NEWNYM

2011-04-28 Thread nickm
commit f1cf9bd74d225e90ca123eb664c1c5538eedaa03 Author: Robert Ransom rransom.8...@gmail.com Date: Mon Apr 25 06:38:35 2011 -0700 Fix a bug introduced by purging rend_cache on NEWNYM If the user sent a SIGNAL NEWNYM command after we fetched a rendezvous descriptor, while we

[tor-commits] [tor/master] Allow rend_client_send_introduction to fail transiently

2011-04-28 Thread nickm
commit 2ad18ae7366ce4979b44fa53d0105940005489c0 Author: Robert Ransom rransom.8...@gmail.com Date: Mon Apr 25 08:36:02 2011 -0700 Allow rend_client_send_introduction to fail transiently i.e. without closing the AP connection. --- changes/forget-rend-descs-on-newnym |4

[tor-commits] [tor/master] Merge branch 'bug3k_021' into bug3k_022

2011-04-28 Thread nickm
commit 4b13ebd5ab4d051803e9cfde8bb965a4bf8ea90d Merge: 0130e7c 8a36f21 Author: Sebastian Hahn sebast...@torproject.org Date: Thu Apr 28 19:00:34 2011 +0200 Merge branch 'bug3k_021' into bug3k_022 Conflicts: src/or/or.h src/or/rendclient.c

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

2011-04-28 Thread nickm
commit 32918e954fa3c2d55eb6b7695bd833197c31e09e Merge: 26456d3 2c0258b Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 15:57:27 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/rendcommon.h changes/forget-rend-descs-on-newnym |

[tor-commits] [tor/maint-0.2.2] Don't report empty bw-history lines in extrainfo

2011-04-28 Thread nickm
commit c1927d7d5f5dff5b8d7da5bd4e7a743eb06bcbb3 Author: Sebastian Hahn sebast...@torproject.org Date: Sat Apr 16 16:01:36 2011 +0200 Don't report empty bw-history lines in extrainfo Some tor relays would report lines like these in their extrainfo documents:

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

2011-04-28 Thread nickm
commit 3055acbdbe914c31ca4825ed60b4cce6676bd61e Merge: 2c0258b c1927d7 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 16:05:34 2011 -0400 Merge remote-tracking branch 'sebastian/bug2497' into maint-0.2.2 changes/ticket2497 |4 src/or/rephist.c | 14

[tor-commits] [tor/master] Don't report empty bw-history lines in extrainfo

2011-04-28 Thread nickm
commit c1927d7d5f5dff5b8d7da5bd4e7a743eb06bcbb3 Author: Sebastian Hahn sebast...@torproject.org Date: Sat Apr 16 16:01:36 2011 +0200 Don't report empty bw-history lines in extrainfo Some tor relays would report lines like these in their extrainfo documents:

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

2011-04-28 Thread nickm
commit 3055acbdbe914c31ca4825ed60b4cce6676bd61e Merge: 2c0258b c1927d7 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 16:05:34 2011 -0400 Merge remote-tracking branch 'sebastian/bug2497' into maint-0.2.2 changes/ticket2497 |4 src/or/rephist.c | 14

[tor-commits] [tor/maint-0.2.2] Correct the logic from f14754fbd for tor_gmtime_r

2011-04-28 Thread nickm
commit 2dc9546eef6d748245d90b288f28ace1aa9b6f14 Author: John Brooks spec...@dereferenced.net Date: Mon Jan 3 21:36:09 2011 -0700 Correct the logic from f14754fbd for tor_gmtime_r --- src/common/compat.c |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.2] Detect and handle NULL returns from (gm/local)time_r

2011-04-28 Thread nickm
commit 51e551d3837990b7c4491253a88bedd2513fe1de Author: Nick Mathewson ni...@torproject.org Date: Tue Dec 7 14:37:50 2010 -0500 Detect and handle NULL returns from (gm/local)time_r These functions can return NULL for otherwise-valid values of time_t. Notably, the glibc gmtime

[tor-commits] [tor/master] Correct the logic from f14754fbd for tor_gmtime_r

2011-04-28 Thread nickm
commit 2dc9546eef6d748245d90b288f28ace1aa9b6f14 Author: John Brooks spec...@dereferenced.net Date: Mon Jan 3 21:36:09 2011 -0700 Correct the logic from f14754fbd for tor_gmtime_r --- src/common/compat.c |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/maint-0.2.2] Don't allow v0 HS auths to act as clients

2011-04-28 Thread nickm
commit df5c7fedbd938c5d4634eadcf53693e07d2c8182 Author: Robert Ransom rransom.8...@gmail.com Date: Wed Apr 20 15:20:10 2011 -0700 Don't allow v0 HS auths to act as clients A v0 HS authority stores v0 HS descriptors in the same descriptor cache that its HS client functionality

[tor-commits] [tor/maint-0.2.2] Avoid false positives from proxy_mode()

2011-04-28 Thread nickm
commit 6dfc0d530113e055d91b68969c81595ddc749f07 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 17:45:41 2011 -0400 Avoid false positives from proxy_mode() Previously it would erroneously return true if ListenAddr was set for a client port, even if that port itself

[tor-commits] [tor/maint-0.2.2] Ignore SIGNAL NEWNYM on relay-only Tor instances

2011-04-28 Thread nickm
commit ddd1b7be2dce0845e6c08dcb5404ae65940b9edb Author: Robert Ransom rransom.8...@gmail.com Date: Wed Apr 20 17:01:41 2011 -0700 Ignore SIGNAL NEWNYM on relay-only Tor instances --- changes/forget-rend-descs-on-newnym |2 ++ src/or/main.c |7 +++ 2 files

[tor-commits] [tor/maint-0.2.2] Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2

2011-04-28 Thread nickm
commit 30003e43180561eb92f4146d3bf2a5f74523cda6 Merge: 2dc9546 6dfc0d5 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 18:13:17 2011 -0400 Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2 changes/forget-rend-descs-on-newnym | 12 src/or/config.c

[tor-commits] [tor/maint-0.2.2] Fix bug 1930

2011-04-28 Thread nickm
commit b8708b5bd30f5ef6dd34f7199a5588627486bcd2 Author: Robert Ransom rransom.8...@gmail.com Date: Tue Apr 26 02:21:25 2011 -0700 Fix bug 1930 --- changes/forget-rend-descs-on-newnym |7 +++ src/or/rendclient.c | 103 +-- 2 files

[tor-commits] [tor/master] Don't allow v0 HS auths to act as clients

2011-04-28 Thread nickm
commit df5c7fedbd938c5d4634eadcf53693e07d2c8182 Author: Robert Ransom rransom.8...@gmail.com Date: Wed Apr 20 15:20:10 2011 -0700 Don't allow v0 HS auths to act as clients A v0 HS authority stores v0 HS descriptors in the same descriptor cache that its HS client functionality

[tor-commits] [tor/master] Ignore SIGNAL NEWNYM on relay-only Tor instances

2011-04-28 Thread nickm
commit ddd1b7be2dce0845e6c08dcb5404ae65940b9edb Author: Robert Ransom rransom.8...@gmail.com Date: Wed Apr 20 17:01:41 2011 -0700 Ignore SIGNAL NEWNYM on relay-only Tor instances --- changes/forget-rend-descs-on-newnym |2 ++ src/or/main.c |7 +++ 2 files

[tor-commits] [tor/master] Avoid false positives from proxy_mode()

2011-04-28 Thread nickm
commit 6dfc0d530113e055d91b68969c81595ddc749f07 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 17:45:41 2011 -0400 Avoid false positives from proxy_mode() Previously it would erroneously return true if ListenAddr was set for a client port, even if that port itself

[tor-commits] [tor/master] Fix bug 1930

2011-04-28 Thread nickm
commit b8708b5bd30f5ef6dd34f7199a5588627486bcd2 Author: Robert Ransom rransom.8...@gmail.com Date: Tue Apr 26 02:21:25 2011 -0700 Fix bug 1930 --- changes/forget-rend-descs-on-newnym |7 +++ src/or/rendclient.c | 103 +-- 2 files

[tor-commits] [tor/master] Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2

2011-04-28 Thread nickm
commit 30003e43180561eb92f4146d3bf2a5f74523cda6 Merge: 2dc9546 6dfc0d5 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 18:13:17 2011 -0400 Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2 changes/forget-rend-descs-on-newnym | 12 src/or/config.c

[tor-commits] [tor/maint-0.2.2] fix a function comment

2011-04-28 Thread arma
commit 710227a77f3d47fec78497b0fabce13b4e3ce728 Author: Roger Dingledine a...@torproject.org Date: Thu Apr 28 19:19:04 2011 -0400 fix a function comment --- src/or/circuitbuild.c |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c

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

2011-04-28 Thread nickm
commit c12289792507c8dd51c2a947f7c910c70df4dd3d Merge: 710227a 525d270 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:03:57 2011 -0400 Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2 changes/bug3020|7 +++ src/or/hibernate.c |3 ++- 2

[tor-commits] [tor/maint-0.2.2] Correctly check elapsed time in last hibernation period

2011-04-28 Thread nickm
commit 525d2700dd8b6c794a69ea0be63864baeff27617 Author: Sebastian Hahn sebast...@torproject.org Date: Fri Apr 29 01:18:32 2011 +0200 Correctly check elapsed time in last hibernation period Fix bug 3020. --- changes/bug3020|7 +++ src/or/hibernate.c |3 ++- 2 files

[tor-commits] [tor/master] Correctly check elapsed time in last hibernation period

2011-04-28 Thread nickm
commit 525d2700dd8b6c794a69ea0be63864baeff27617 Author: Sebastian Hahn sebast...@torproject.org Date: Fri Apr 29 01:18:32 2011 +0200 Correctly check elapsed time in last hibernation period Fix bug 3020. --- changes/bug3020|7 +++ src/or/hibernate.c |3 ++- 2 files

[tor-commits] [tor/master] fix a function comment

2011-04-28 Thread nickm
commit 710227a77f3d47fec78497b0fabce13b4e3ce728 Author: Roger Dingledine a...@torproject.org Date: Thu Apr 28 19:19:04 2011 -0400 fix a function comment --- src/or/circuitbuild.c |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/or/circuitbuild.c

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

2011-04-28 Thread nickm
commit bb8689b86480d81aa150d5f27fa830afc4de4077 Merge: f38ecd5 c122897 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:05:48 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3020 |7 +++ src/or/circuitbuild.c |3 +--

[tor-commits] [tor/maint-0.2.2] Revert If we are not using BEGIN_DIR cells, don't attempt to contact hidden service directories with non-open dir port.

2011-04-28 Thread nickm
commit a6cc15e2aedfc370fc0328edd375a869338ee4f1 Author: Robert Ransom rransom.8...@gmail.com Date: Sat Mar 12 07:17:26 2011 -0800 Revert If we are not using BEGIN_DIR cells, don't attempt to contact hidden service directories with non-open dir port. This reverts commit

[tor-commits] [tor/maint-0.2.2] Add an XXX to the DA code regarding bug 2722

2011-04-28 Thread nickm
commit 134da2fbcf865418863bda8d4c479a20f6f6651d Author: Robert Ransom rransom.8...@gmail.com Date: Mon Apr 18 12:00:48 2011 -0700 Add an XXX to the DA code regarding bug 2722 --- src/or/dirserv.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/dirserv.c

[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branches 'rransom/bug2722' and 'rransom/bug2722b' into maint-0.2.2

2011-04-28 Thread nickm
commit 6b9aadd557de171f0de7b700ba427a9a37a545fa Merge: c122897 eb50e3d 134da2f Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:36:38 2011 -0400 Merge remote-tracking branches 'rransom/bug2722' and 'rransom/bug2722b' into maint-0.2.2 changes/bug2722 | 11 +++

[tor-commits] [tor/maint-0.2.2] Clarify comment to say which version fixed 2722

2011-04-28 Thread nickm
commit 5693fedb60ee19048d45ed892edb07925b52678b Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:38:15 2011 -0400 Clarify comment to say which version fixed 2722 --- src/or/dirserv.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c

[tor-commits] [tor/master] Revert If we are not using BEGIN_DIR cells, don't attempt to contact hidden service directories with non-open dir port.

2011-04-28 Thread nickm
commit a6cc15e2aedfc370fc0328edd375a869338ee4f1 Author: Robert Ransom rransom.8...@gmail.com Date: Sat Mar 12 07:17:26 2011 -0800 Revert If we are not using BEGIN_DIR cells, don't attempt to contact hidden service directories with non-open dir port. This reverts commit

[tor-commits] [tor/master] Add an XXX to the DA code regarding bug 2722

2011-04-28 Thread nickm
commit 134da2fbcf865418863bda8d4c479a20f6f6651d Author: Robert Ransom rransom.8...@gmail.com Date: Mon Apr 18 12:00:48 2011 -0700 Add an XXX to the DA code regarding bug 2722 --- src/or/dirserv.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/dirserv.c

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

2011-04-28 Thread nickm
commit 9d67d16c6a99c662f0fe81068f66de471b39a616 Merge: bb8689b 5693fed Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:38:50 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug2722 | 11 +++ src/or/dirserv.c|3 +++

[tor-commits] [tor/maint-0.2.2] stop putting wacky values into state-lastwritten

2011-04-28 Thread nickm
commit df3cf881d1d217b6ff3757bf95f8c2784584fec8 Author: Roger Dingledine a...@torproject.org Date: Thu Apr 28 20:40:15 2011 -0400 stop putting wacky values into state-lastwritten --- changes/bug3039 |5 + src/or/circuitbuild.c |2 +- src/or/config.c | 20

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

2011-04-28 Thread nickm
commit 4010427b519c3727351905bbe5a75e85a055dd58 Merge: 5693fed df3cf88 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:53:44 2011 -0400 Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2 changes/bug3039 |5 + src/or/circuitbuild.c |2 +-

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

2011-04-28 Thread nickm
commit 4010427b519c3727351905bbe5a75e85a055dd58 Merge: 5693fed df3cf88 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:53:44 2011 -0400 Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2 changes/bug3039 |5 + src/or/circuitbuild.c |2 +-

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

2011-04-28 Thread nickm
commit b0a7e0d6ca45bef3c5836d9082dcc9461cee6c9c Merge: 9d67d16 4010427 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:55:03 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3039 |5 + src/or/circuitbuild.c |2 +- src/or/config.c

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

2011-04-28 Thread nickm
commit f0d9e2d6507adcc069b38cd9e0aaf6702f576314 Merge: 4010427 66de6f7 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 21:15:14 2011 -0400 Merge remote-tracking branch 'arma/bug3012' into maint-0.2.2 changes/bug3012 |5 + src/or/config.c | 11 ++- 2 files

[tor-commits] [tor/maint-0.2.2] relays checkpoint their state file twice a day

2011-04-28 Thread nickm
commit 66de6f7eb8e2948f6c3849dbca20c7b31969b5b7 Author: Roger Dingledine a...@torproject.org Date: Thu Apr 28 21:06:25 2011 -0400 relays checkpoint their state file twice a day --- changes/bug3012 |5 + src/or/config.c | 11 ++- 2 files changed, 15 insertions(+), 1

[tor-commits] [tor/release-0.2.2] Add changes file for previous commit

2011-04-28 Thread nickm
commit eb50e3d6bf6eb9880f92050cb0db849394bd6cb0 Author: Robert Ransom rransom.8...@gmail.com Date: Sat Mar 12 07:29:04 2011 -0800 Add changes file for previous commit --- changes/bug2722 | 11 +++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/bug2722

[tor-commits] [tor/release-0.2.2] Don't report empty bw-history lines in extrainfo

2011-04-28 Thread nickm
commit c1927d7d5f5dff5b8d7da5bd4e7a743eb06bcbb3 Author: Sebastian Hahn sebast...@torproject.org Date: Sat Apr 16 16:01:36 2011 +0200 Don't report empty bw-history lines in extrainfo Some tor relays would report lines like these in their extrainfo documents:

[tor-commits] [tor/release-0.2.2] Add an XXX to the DA code regarding bug 2722

2011-04-28 Thread nickm
commit 134da2fbcf865418863bda8d4c479a20f6f6651d Author: Robert Ransom rransom.8...@gmail.com Date: Mon Apr 18 12:00:48 2011 -0700 Add an XXX to the DA code regarding bug 2722 --- src/or/dirserv.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/dirserv.c

[tor-commits] [tor/release-0.2.2] Make SIZE_T_CEILING unsigned; add a signed SSIZE_T_CEILING

2011-04-28 Thread nickm
commit 43ffd023e9267927539dc9c12bee86199cd1c800 Author: Nick Mathewson ni...@torproject.org Date: Tue Apr 26 13:00:46 2011 -0400 Make SIZE_T_CEILING unsigned; add a signed SSIZE_T_CEILING None of the comparisons were _broken_ previously, but avoiding signed/unsigned comparisons

[tor-commits] [tor/release-0.2.2] Fix clear_trackhostexits_mapping() to actually work as advertised

2011-04-28 Thread nickm
commit 34510f9278675e6e041503e425ca19a1fa0f3616 Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 27 17:21:41 2011 -0400 Fix clear_trackhostexits_mapping() to actually work as advertised Previously, it would remove every trackhostexits-derived mapping *from*

[tor-commits] [tor/release-0.2.2] I guess that had a bug number: add it to the changes file.

2011-04-28 Thread nickm
commit 7f85509a59b88173ac6060cd5925e28415f016b4 Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 27 17:26:28 2011 -0400 I guess that had a bug number: add it to the changes file. --- changes/clear_trackexithost |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff

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

2011-04-28 Thread nickm
commit 0130e7c9d2842ad58e1b84829aeab16a2efba3bb Merge: 7f85509 43ffd02 Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 27 22:14:28 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 Conflicts: src/common/torint.h changes/bug2475 |

[tor-commits] [tor/release-0.2.2] Forget all rendezvous client state on SIGNAL NEWNYM

2011-04-28 Thread nickm
commit 440e48ddf27094e48c401c68c9014eca43b6867e Author: Robert Ransom rransom.8...@gmail.com Date: Wed Apr 20 02:27:58 2011 -0700 Forget all rendezvous client state on SIGNAL NEWNYM --- changes/forget-rend-descs-on-newnym |5 src/or/main.c |2 +

[tor-commits] [tor/release-0.2.2] Fix a bug introduced by purging rend_cache on NEWNYM

2011-04-28 Thread nickm
commit f1cf9bd74d225e90ca123eb664c1c5538eedaa03 Author: Robert Ransom rransom.8...@gmail.com Date: Mon Apr 25 06:38:35 2011 -0700 Fix a bug introduced by purging rend_cache on NEWNYM If the user sent a SIGNAL NEWNYM command after we fetched a rendezvous descriptor, while we

[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'sebastian/bug2497' into maint-0.2.2

2011-04-28 Thread nickm
commit 3055acbdbe914c31ca4825ed60b4cce6676bd61e Merge: 2c0258b c1927d7 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 16:05:34 2011 -0400 Merge remote-tracking branch 'sebastian/bug2497' into maint-0.2.2 changes/ticket2497 |4 src/or/rephist.c | 14

[tor-commits] [tor/release-0.2.2] Fix a failure case of connection_ap_handshake_attach_circuit()

2011-04-28 Thread nickm
commit 8a36f2125137dc31a0771a8eeac0f2bb8c1343d0 Author: Sebastian Hahn sebast...@torproject.org Date: Thu Apr 28 01:48:25 2011 +0200 Fix a failure case of connection_ap_handshake_attach_circuit() tor_fragile_assert() might be a no-op, so we have to return something here to

[tor-commits] [tor/release-0.2.2] Allow rend_client_send_introduction to fail transiently

2011-04-28 Thread nickm
commit 2ad18ae7366ce4979b44fa53d0105940005489c0 Author: Robert Ransom rransom.8...@gmail.com Date: Mon Apr 25 08:36:02 2011 -0700 Allow rend_client_send_introduction to fail transiently i.e. without closing the AP connection. --- changes/forget-rend-descs-on-newnym |4

[tor-commits] [tor/release-0.2.2] Clean up merge of bug3k_021

2011-04-28 Thread nickm
commit 2c0258b69a232a7b11ecc999bee74dac1c1b1495 Author: Robert Ransom rransom.8...@gmail.com Date: Thu Apr 28 10:37:35 2011 -0700 Clean up merge of bug3k_021 --- src/or/rendclient.c |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/rendclient.c

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

2011-04-28 Thread nickm
commit 4b13ebd5ab4d051803e9cfde8bb965a4bf8ea90d Merge: 0130e7c 8a36f21 Author: Sebastian Hahn sebast...@torproject.org Date: Thu Apr 28 19:00:34 2011 +0200 Merge branch 'bug3k_021' into bug3k_022 Conflicts: src/or/or.h src/or/rendclient.c

[tor-commits] [tor/release-0.2.2] Don't allow v0 HS auths to act as clients

2011-04-28 Thread nickm
commit df5c7fedbd938c5d4634eadcf53693e07d2c8182 Author: Robert Ransom rransom.8...@gmail.com Date: Wed Apr 20 15:20:10 2011 -0700 Don't allow v0 HS auths to act as clients A v0 HS authority stores v0 HS descriptors in the same descriptor cache that its HS client functionality

[tor-commits] [tor/release-0.2.2] Avoid false positives from proxy_mode()

2011-04-28 Thread nickm
commit 6dfc0d530113e055d91b68969c81595ddc749f07 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 17:45:41 2011 -0400 Avoid false positives from proxy_mode() Previously it would erroneously return true if ListenAddr was set for a client port, even if that port itself

[tor-commits] [tor/release-0.2.2] Fix bug 1930

2011-04-28 Thread nickm
commit b8708b5bd30f5ef6dd34f7199a5588627486bcd2 Author: Robert Ransom rransom.8...@gmail.com Date: Tue Apr 26 02:21:25 2011 -0700 Fix bug 1930 --- changes/forget-rend-descs-on-newnym |7 +++ src/or/rendclient.c | 103 +-- 2 files

[tor-commits] [tor/release-0.2.2] Correct the logic from f14754fbd for tor_gmtime_r

2011-04-28 Thread nickm
commit 2dc9546eef6d748245d90b288f28ace1aa9b6f14 Author: John Brooks spec...@dereferenced.net Date: Mon Jan 3 21:36:09 2011 -0700 Correct the logic from f14754fbd for tor_gmtime_r --- src/common/compat.c |8 +--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/release-0.2.2] Ignore SIGNAL NEWNYM on relay-only Tor instances

2011-04-28 Thread nickm
commit ddd1b7be2dce0845e6c08dcb5404ae65940b9edb Author: Robert Ransom rransom.8...@gmail.com Date: Wed Apr 20 17:01:41 2011 -0700 Ignore SIGNAL NEWNYM on relay-only Tor instances --- changes/forget-rend-descs-on-newnym |2 ++ src/or/main.c |7 +++ 2 files

[tor-commits] [tor/release-0.2.2] Correctly check elapsed time in last hibernation period

2011-04-28 Thread nickm
commit 525d2700dd8b6c794a69ea0be63864baeff27617 Author: Sebastian Hahn sebast...@torproject.org Date: Fri Apr 29 01:18:32 2011 +0200 Correctly check elapsed time in last hibernation period Fix bug 3020. --- changes/bug3020|7 +++ src/or/hibernate.c |3 ++- 2 files

[tor-commits] [tor/release-0.2.2] Merge remote-tracking branches 'rransom/bug2722' and 'rransom/bug2722b' into maint-0.2.2

2011-04-28 Thread nickm
commit 6b9aadd557de171f0de7b700ba427a9a37a545fa Merge: c122897 eb50e3d 134da2f Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:36:38 2011 -0400 Merge remote-tracking branches 'rransom/bug2722' and 'rransom/bug2722b' into maint-0.2.2 changes/bug2722 | 11 +++

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

2011-04-28 Thread nickm
commit 68a169ec55f4d1e1b5b9e4f396267681ee3c4ba5 Merge: 79d55f6 f0d9e2d Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 22:08:53 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into release-0.2.2 changes/bug2475 |5 + changes/bug2722

[tor-commits] [tor/release-0.2.2] Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2

2011-04-28 Thread nickm
commit 30003e43180561eb92f4146d3bf2a5f74523cda6 Merge: 2dc9546 6dfc0d5 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 18:13:17 2011 -0400 Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2 changes/forget-rend-descs-on-newnym | 12 src/or/config.c

[tor-commits] [tor/release-0.2.2] relays checkpoint their state file twice a day

2011-04-28 Thread nickm
commit 66de6f7eb8e2948f6c3849dbca20c7b31969b5b7 Author: Roger Dingledine a...@torproject.org Date: Thu Apr 28 21:06:25 2011 -0400 relays checkpoint their state file twice a day --- changes/bug3012 |5 + src/or/config.c | 11 ++- 2 files changed, 15 insertions(+), 1

[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2

2011-04-28 Thread nickm
commit c12289792507c8dd51c2a947f7c910c70df4dd3d Merge: 710227a 525d270 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:03:57 2011 -0400 Merge remote-tracking branch 'sebastian/bug3020' into maint-0.2.2 changes/bug3020|7 +++ src/or/hibernate.c |3 ++- 2

[tor-commits] [tor/release-0.2.2] Clarify comment to say which version fixed 2722

2011-04-28 Thread nickm
commit 5693fedb60ee19048d45ed892edb07925b52678b Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:38:15 2011 -0400 Clarify comment to say which version fixed 2722 --- src/or/dirserv.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c

[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2

2011-04-28 Thread nickm
commit 4010427b519c3727351905bbe5a75e85a055dd58 Merge: 5693fed df3cf88 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 20:53:44 2011 -0400 Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2 changes/bug3039 |5 + src/or/circuitbuild.c |2 +-

[tor-commits] [tor/release-0.2.2] Merge changes files into 0.2.2.25 changelog

2011-04-28 Thread nickm
commit 540c6f12cdbad84667e0def720d985f1cd8680ec Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 22:53:43 2011 -0400 Merge changes files into 0.2.2.25 changelog --- ChangeLog | 46 -- changes/bug2475

[tor-commits] [tor/release-0.2.2] Edit the changelog a little more

2011-04-28 Thread nickm
commit d760e91d1d8ef9f50ec09d53d05c4e2d4d36f3c7 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 23:02:39 2011 -0400 Edit the changelog a little more --- ChangeLog | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [tor/release-0.2.2] Edit the changelog a little more, based on notes from arma

2011-04-28 Thread nickm
commit 7afa8a30da206b04c63174735227606336f9671c Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 23:12:48 2011 -0400 Edit the changelog a little more, based on notes from arma --- ChangeLog | 30 +++--- 1 files changed, 15 insertions(+), 15

[tor-commits] [tor/release-0.2.2] Re-wrap changelog section for 0.2.2.25-alpha

2011-04-28 Thread nickm
commit 95dceffe1bdbf0c249a2ab079ef31a114b152d49 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 23:17:43 2011 -0400 Re-wrap changelog section for 0.2.2.25-alpha --- ChangeLog | 151 ++--- 1 files changed, 74

[tor-commits] [tor/release-0.2.2] Add a blurb; fix some double-spaces in the changelog

2011-04-28 Thread nickm
commit c2ce18fae1f5472d70697504e4ff9219cb123ed9 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 23:30:34 2011 -0400 Add a blurb; fix some double-spaces in the changelog --- ChangeLog | 26 ++ 1 files changed, 18 insertions(+), 8 deletions(-) diff

[tor-commits] [tor/release-0.2.2] Actually, let's sleep on 0.2.2.25-alpha and put it out in the morning

2011-04-28 Thread nickm
commit d715984a04ed943d50da92478b33cb337342e9d1 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 23:32:38 2011 -0400 Actually, let's sleep on 0.2.2.25-alpha and put it out in the morning (Bump release date) --- ChangeLog |2 +- 1 files changed, 1 insertions(+), 1

[tor-commits] [tor/maint-0.2.2] Update hacking file with terse notes on formatting changelog

2011-04-28 Thread nickm
commit 676190e895a94978fbda82527f7ba2dbf8ccda80 Author: Nick Mathewson ni...@torproject.org Date: Thu Apr 28 23:44:48 2011 -0400 Update hacking file with terse notes on formatting changelog --- doc/HACKING | 33 + 1 files changed, 33 insertions(+), 0

[tor-commits] [tor/maint-0.2.2] add another heuristic for changes stanzas

2011-04-28 Thread arma
commit 93b0183d3cae436732b48d36aa9b54964854a0a4 Author: Roger Dingledine a...@torproject.org Date: Fri Apr 29 01:35:21 2011 -0400 add another heuristic for changes stanzas --- doc/HACKING |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/doc/HACKING b/doc/HACKING