[tor-commits] [arm/master] fix: concurrency issue could crash from CIRC event

2011-09-24 Thread atagar
commit e884fcbd894c9e764c60e6b40c5bd3e14583352e Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 13:03:20 2011 -0700 fix: concurrency issue could crash from CIRC event If we got a CIRC event while populating the cache of relays that we're attached to we could

[tor-commits] [arm/master] fix: clarifying missing armrc message

2011-09-24 Thread atagar
commit 73de20de4a69bc055cf23d5852e0ac8b007af1a9 Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 12:54:39 2011 -0700 fix: clarifying missing armrc message Occasionally people are confused by the notice that no armrc was loaded, thinking that it's a problem. Trying

[tor-commits] [arm/master] Quiting wizard when the user presses 'q'

2011-09-24 Thread atagar
commit 30fc358c617ebd075119e20fd6e532150b432e24 Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 13:14:54 2011 -0700 Quiting wizard when the user presses 'q' Users could cancel the wizard by prssing esc, but it's also intuitive to expect 'q' to do the same (since

[tor-commits] [arm/master] fix: fetching relay address could ignored default

2011-09-24 Thread atagar
commit 0b9d52bc7c33aa722cca219882832bc4d2ed44a6 Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 16:43:47 2011 -0700 fix: fetching relay address could ignored default The getRelayAddress function would ignore its default argument if tor is shut down, causing it to

[tor-commits] [arm/master] fix: wizard showed wrong torrc path for sys torrc

2011-09-24 Thread atagar
commit 458073c58d103b8dc633b36f56d77602865911e7 Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 14:33:25 2011 -0700 fix: wizard showed wrong torrc path for sys torrc When the user opts for the generated torrc to be for the system instance the wizard shows the

[tor-commits] [arm/master] Toning down arm's notice when resolvers fail

2011-09-24 Thread atagar
commit 019ee06a104b796bee4398efc7b6dff4c368fc09 Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 15:27:38 2011 -0700 Toning down arm's notice when resolvers fail When arm failed to query tor's connections it would give a short warning saying so. This often spooked

[tor-commits] [arm/master] Cautioning users against running tor as root

2011-09-24 Thread atagar
commit b1a5794c26d02b31a32762a4ef357878f4742fb7 Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 16:14:22 2011 -0700 Cautioning users against running tor as root Notice level message at startup that cautions the user against running tor as root. ---

[tor-commits] [arm/master] fix: dropping os check for startup wizard option

2011-09-24 Thread atagar
commit 7a187c482f306fbfbe83552cc2a618e393e357e3 Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 14:43:35 2011 -0700 fix: dropping os check for startup wizard option The startup wizard option is currently unimplemented and disabled in the setting.cfg. However,

[tor-commits] [arm/master] Cautioning users against running arm as root

2011-09-24 Thread atagar
commit e0248705018a57c55d7c99295a66857b617a06f1 Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 16:56:26 2011 -0700 Cautioning users against running arm as root Notice level message at startup that cautions the user against running arm as root. ---

[tor-commits] [arm/master] fix: renaming prompt and format to avoid ambiguity

2011-09-24 Thread atagar
commit e2e3091c1af2741e046831fdecd73677b3c1652b Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 17:29:05 2011 -0700 fix: renaming prompt and format to avoid ambiguity Renaming the prompt function and format variable to avoid a naming conflict with other uses of

[tor-commits] [arm/master] Minor fixes spotted while prepping for release

2011-09-24 Thread atagar
commit d84dc4dba0c3143337ba6ebbf50f75df33ae6e15 Author: Damian Johnson ata...@torproject.org Date: Sat Sep 24 17:53:25 2011 -0700 Minor fixes spotted while prepping for release --- README |1 + src/cli/interpretorPanel.py |2 +- src/util/__init__.py|

[tor-commits] [tor/maint-0.2.2] Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO

2011-09-24 Thread nickm
commit 5835acc6f910e2bb1e3908802717eeff4122a9b8 Author: Tom Lowenthal m...@tomlowenthal.com Date: Sat Sep 24 15:34:32 2011 -0700 Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO --- src/or/circuitbuild.c |6 +++--- 1 files changed, 3 insertions(+), 3

[tor-commits] [tor/maint-0.2.2] Add a changes file for Tom Lowenthal's patch for #4063

2011-09-24 Thread nickm
commit ccceefe13674119768436bd1b9e3c4bf04ffc5ed Author: Nick Mathewson ni...@torproject.org Date: Sat Sep 24 22:15:13 2011 -0400 Add a changes file for Tom Lowenthal's patch for #4063 --- changes/ticket-4063 |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git

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

2011-09-24 Thread nickm
commit c42a1886cccbcd4f6e6e90526b5132d6a6cbb2a4 Author: Nick Mathewson ni...@torproject.org Date: Sat Sep 24 22:15:59 2011 -0400 Trivial whitespace fixes --- src/or/connection_edge.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/connection_edge.c

[tor-commits] [tor/maint-0.2.2] trivial whitespace changes, take two

2011-09-24 Thread arma
commit 1c2e4d13366aee5f0107696e4d621b924a6f39a6 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 24 22:46:21 2011 -0400 trivial whitespace changes, take two --- src/or/connection_edge.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git

[tor-commits] [tor/master] Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO

2011-09-24 Thread arma
commit 5835acc6f910e2bb1e3908802717eeff4122a9b8 Author: Tom Lowenthal m...@tomlowenthal.com Date: Sat Sep 24 15:34:32 2011 -0700 Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO --- src/or/circuitbuild.c |6 +++--- 1 files changed, 3 insertions(+), 3

[tor-commits] [tor/master] Add a changes file for Tom Lowenthal's patch for #4063

2011-09-24 Thread arma
commit ccceefe13674119768436bd1b9e3c4bf04ffc5ed Author: Nick Mathewson ni...@torproject.org Date: Sat Sep 24 22:15:13 2011 -0400 Add a changes file for Tom Lowenthal's patch for #4063 --- changes/ticket-4063 |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git

[tor-commits] [tor/master] trivial whitespace changes, take two

2011-09-24 Thread arma
commit 1c2e4d13366aee5f0107696e4d621b924a6f39a6 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 24 22:46:21 2011 -0400 trivial whitespace changes, take two --- src/or/connection_edge.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git

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

2011-09-24 Thread arma
commit c42a1886cccbcd4f6e6e90526b5132d6a6cbb2a4 Author: Nick Mathewson ni...@torproject.org Date: Sat Sep 24 22:15:59 2011 -0400 Trivial whitespace fixes --- src/or/connection_edge.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/connection_edge.c

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

2011-09-24 Thread arma
commit 88516f65c9753d6ec60dd7cb0c28c3ff91fdb101 Merge: 5a8dcca 1c2e4d1 Author: Roger Dingledine a...@torproject.org Date: Sat Sep 24 22:47:53 2011 -0400 Merge branch 'maint-0.2.2' changes/ticket-4063 |6 ++ src/or/circuitbuild.c |6 +++--- 2 files changed, 9 insertions(+), 3