[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

commit 04ac9302348734a4230a47ad09246020835fea78 Author: Translation commit bot Date: Sat Oct 8 01:31:22 2011 + Update translations for vidalia_help --- hu/troubleshooting.po |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hu/troubleshooting.po b/hu/trouble

[tor-commits] [translation/vidalia] Update translations for vidalia

commit f39947944ff6207619e0d77ffdc0f5e716315ff7 Author: Translation commit bot Date: Sat Oct 8 01:22:34 2011 + Update translations for vidalia --- hi/vidalia_hi.po | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po in

[tor-commits] [translation/vidalia] Update translations for vidalia

commit 1fd370faa51535fe216b4a1d85248e2638e68eda Author: Translation commit bot Date: Sat Oct 8 00:51:42 2011 + Update translations for vidalia --- hi/vidalia_hi.po | 429 +++--- 1 files changed, 215 insertions(+), 214 deletions(-) diff

[tor-commits] [translation/vidalia] Update translations for vidalia

commit c9f434a13241f6bde6447d15c2fdeca4b5a78d77 Author: Translation commit bot Date: Sat Oct 8 00:22:15 2011 + Update translations for vidalia --- hi/vidalia_hi.po | 13 - 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po i

[tor-commits] r25157: {website} Additional comments from Georg Koppen. (website/trunk/projects/torbrowser/design)

Author: mikeperry Date: 2011-10-07 23:44:03 + (Fri, 07 Oct 2011) New Revision: 25157 Modified: website/trunk/projects/torbrowser/design/index.html.en Log: Additional comments from Georg Koppen. Modified: website/trunk/projects/torbrowser/design/index.html.en =

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

commit 19f1d3e331dfa34ab78d9bb90c61674e49ceae52 Merge: 1ec22ea f37d24c Author: Nick Mathewson Date: Fri Oct 7 16:49:52 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' This merge is here to take a commit (feature 3951) that we already have in master, so use "merge -

[tor-commits] [tor/master] Note ticket and source version for feature3951 in changes file

commit f37d24c550a0d8512249f77262c01960af6ed31b Author: Nick Mathewson Date: Fri Oct 7 16:47:43 2011 -0400 Note ticket and source version for feature3951 in changes file --- changes/dirreq-stats-default |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/changes/dirreq

[tor-commits] [tor/master] Turn on directory request statistics by default.

commit 9dfb8845229ed66efbb8dec6c624f8adb7c9 Author: Karsten Loesing Date: Tue Nov 9 14:18:00 2010 +0100 Turn on directory request statistics by default. Change the default values for collecting directory request statistics and inlcuding them in extra-info descriptors to 1.

[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2

commit ca597efb2288996f3fae763f3c01849402ac6514 Merge: 6d027a3 9dfb884 Author: Nick Mathewson Date: Fri Oct 7 16:46:50 2011 -0400 Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2 changes/dirreq-stats-default |4 ++ src/or/config.c | 63 +++

[tor-commits] [tor/maint-0.2.2] Note ticket and source version for feature3951 in changes file

commit f37d24c550a0d8512249f77262c01960af6ed31b Author: Nick Mathewson Date: Fri Oct 7 16:47:43 2011 -0400 Note ticket and source version for feature3951 in changes file --- changes/dirreq-stats-default |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/changes/dirreq

[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2

commit ca597efb2288996f3fae763f3c01849402ac6514 Merge: 6d027a3 9dfb884 Author: Nick Mathewson Date: Fri Oct 7 16:46:50 2011 -0400 Merge remote-tracking branch 'karsten/feature3951' into maint-0.2.2 changes/dirreq-stats-default |4 ++ src/or/config.c | 63 +++

[tor-commits] [tor/maint-0.2.2] Turn on directory request statistics by default.

commit 9dfb8845229ed66efbb8dec6c624f8adb7c9 Author: Karsten Loesing Date: Tue Nov 9 14:18:00 2010 +0100 Turn on directory request statistics by default. Change the default values for collecting directory request statistics and inlcuding them in extra-info descriptors to 1.

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug2003_nm'

commit 1ec22eac4bf20424624fe2ef2151ff57687912de Merge: 8b0ee60 9bdde89 Author: Nick Mathewson Date: Fri Oct 7 16:43:45 2011 -0400 Merge remote-tracking branch 'public/bug2003_nm' changes/bug2003 |8 src/or/hibernate.c | 38 +++--- src/or

[tor-commits] [tor/master] Make the unit tests pass again after the bug2003 fix

commit 9bdde8902716bf923a78d8c287acadb0c4d2ffcd Author: Nick Mathewson Date: Wed Sep 7 17:48:21 2011 -0400 Make the unit tests pass again after the bug2003 fix --- src/or/hibernate.c | 28 ++-- src/or/hibernate.h | 22 ++ src/test/test_dir.

[tor-commits] [tor/master] Don't update AccountingSoftLimitHitAt on startup

commit d10ae9c02808c10b19bca66cdc1972616b2b6646 Author: Sebastian Hahn Date: Thu Sep 1 05:21:50 2011 +0200 Don't update AccountingSoftLimitHitAt on startup Add a "default" state which we use until we've decided whether we're live or hibernating. This allows us to properly track

[tor-commits] [tor/master] reinstate a notice for the non-loopback socksport case

commit 8b0ee60fe7752f4894fff8334eff786e80941302 Author: Nick Mathewson Date: Fri Oct 7 16:34:21 2011 -0400 reinstate a notice for the non-loopback socksport case Thanks to prop171, it's no longer a crazy thing to do, but you should make sure that you really meant it! --- src/o

[tor-commits] [tor/master] Fix a bogus warning

commit c1ac0695d5bc64b555c345e4be87b18bab3ae56b Author: Robert Ransom Date: Wed Sep 14 00:05:03 2011 -0700 Fix a bogus warning --- changes/dont-warn-about-rfc1918-socksport-addrs |7 +++ src/or/config.c |5 +++-- 2 files changed, 10 insertions(+)

[tor-commits] [tor/master] Merge remote-tracking branch 'rransom-tor/bug4018'

commit b49fcc6cf2b893fca04eaec8d30bbfe25c04d360 Merge: e8ed465 c1ac069 Author: Nick Mathewson Date: Fri Oct 7 16:32:04 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug4018' changes/dont-warn-about-rfc1918-socksport-addrs |7 +++ src/or/config.c

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug2430'

commit e8ed4657764effb4f16fd5721c13f3384fdd8db1 Merge: ed39621 296649f Author: Nick Mathewson Date: Fri Oct 7 16:28:32 2011 -0400 Merge remote-tracking branch 'public/bug2430' changes/bug2430 |4 configure.in|4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) _

[tor-commits] [tor/master] Provide missing description for our FLEXIBLE_ARRAY_MEMBER defines

commit 296649fd2b0aa1d0c328ca8b494d746a75cbb28b Author: Nick Mathewson Date: Tue Sep 13 19:51:37 2011 -0400 Provide missing description for our FLEXIBLE_ARRAY_MEMBER defines Apparently autoheader throws a tantrum if you say 'AC_DEFINE([a], [b])'. Instead you must say 'AC_DEFIN

[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'asn/bug3437_v2'

commit 169fb1c7d3f40b90538307be920b01c42540ae9d Merge: 70cb7af b4cb428 Author: Nick Mathewson Date: Fri Oct 7 16:17:19 2011 -0400 Merge remote-tracking branch 'asn/bug3437_v2' src/sha256.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ___

[tor-commits] [obfsproxy/master] Fix little copy/paste error.

commit b4cb4281fc725fc53bebae5190f99df816c67876 Author: George Kadianakis Date: Fri Oct 7 19:29:42 2011 +0200 Fix little copy/paste error. --- src/sha256.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/sha256.c b/src/sha256.c index a49bf3b..8d835d4 100644 --

[tor-commits] [torspec/master] Support multiple transports in a single transport line.

commit ef5a3c93402000dcaa5eff4878010cbb36a01205 Author: George Kadianakis Date: Wed Oct 5 16:41:09 2011 +0200 Support multiple transports in a single transport line. Support multiple comma-separated transpotrs in a single {Client,Server}TransportPlugin line. --- proposals/180-

[tor-commits] [tor/master] Revive our beautiful unit tests.

commit 1174bb95ce79767cfaee4f50ce70f42e7eb01b2e Author: George Kadianakis Date: Fri Oct 7 15:44:58 2011 +0200 Revive our beautiful unit tests. They broke when the PT_PROTO_INFANT proxy state was added. --- src/test/test_pt.c |6 ++ 1 files changed, 2 insertions(+), 4 delet

[tor-commits] [tor/master] Make check-spaces happy.

commit de7565f87fba14973038fbcd740ff9fecaa28b4e Author: George Kadianakis Date: Sun Sep 11 23:34:36 2011 +0200 Make check-spaces happy. --- src/common/util.c |6 -- src/or/circuitbuild.c | 10 +- src/or/config.c |9 + src/or/transports.c | 11 +++

[tor-commits] [tor/master] Support multiple transports in a single transport line.

commit 105cc42e96ea979bf3ba0d410c510cd229f0 Author: George Kadianakis Date: Fri Oct 7 14:13:41 2011 +0200 Support multiple transports in a single transport line. Support multiple comma-separated transpotrs in a single {Client,Server}TransportPlugin line. --- src/or/config.

[tor/master] Make it compile on Windows™.

commit 3be9d76fa2e56a9715e8151d9b6802da5b38512a Author: George Kadianakis Date: Fri Oct 7 15:44:44 2011 +0200 Make it compile on Windows™. --- src/common/util.c |8 +++- src/or/transports.c | 20 ++-- src/or/transports.h |2 +- 3 files changed, 18 insertio

[tor-commits] [tor/master] Put some sense into our logging.

commit 2e73f9b3eeb37d0307197e48ed62e1def40e44a8 Author: George Kadianakis Date: Mon Sep 12 00:10:07 2011 +0200 Put some sense into our logging. Transform our logging severities to something more sensible. Remove sneaky printf()s. --- src/common/util.c |2 +- src/or/cir

[tor-commits] [tor/master] Enforce transport names being C identifiers.

commit c6811c57cb75b2c594b2a6fffaca0c5ae4c19e0a Author: George Kadianakis Date: Sun Sep 11 23:34:11 2011 +0200 Enforce transport names being C identifiers. Introduce string_is_C_identifier() and use it to enforce transport names according to the 180 spec. --- src/common/util.c

[tor-commits] [tor/master] Don't warn of stray Bridges if managed proxies are still unconfigured.

commit d0416ce3ec67ca87448153c8b2416dd7901013c6 Author: George Kadianakis Date: Sun Sep 11 23:51:29 2011 +0200 Don't warn of stray Bridges if managed proxies are still unconfigured. With managed proxies you would always get the error message: "You have a Bridge line using

[tor-commits] [tor/master] Fix bug in get_transport_in_state_by_name() when using strcmpstart().

commit ebc232bb79c8816d17eea75d3a29c1ecb25da0b0 Author: George Kadianakis Date: Sun Sep 11 21:22:37 2011 +0200 Fix bug in get_transport_in_state_by_name() when using strcmpstart(). We now split the state lines into smartlists and compare the token properly. Not that efficient b

[tor-commits] [tor/master] Improve wording in some comments and log messages.

commit e2703e36545babce19cd248299a5a12cdd11dff2 Author: George Kadianakis Date: Fri Sep 23 17:50:56 2011 +0200 Improve wording in some comments and log messages. --- src/or/circuitbuild.c | 10 +++--- src/or/config.c |6 ++-- src/or/transports.c | 81 +++

[tor-commits] [tor/master] Allow interwined {Client, Server}TransportPlugin lines.

commit 9bf34eb65b9533bf9a53952acf2994b9ee973ff2 Author: George Kadianakis Date: Sun Sep 11 20:30:08 2011 +0200 Allow interwined {Client,Server}TransportPlugin lines. --- src/or/transports.c |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/or/transports.c b

[tor-commits] [tor/master] Constification.

commit e8715b30411062d09832e912d87d526dc203e4f0 Author: George Kadianakis Date: Sun Sep 11 23:35:00 2011 +0200 Constification. --- src/or/config.c |2 +- src/or/transports.c |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.

[tor-commits] [tor/master] Trivial fixes around the code.

commit 31361074216534b0a4c6377730c09b261ca4ef4e Author: George Kadianakis Date: Sun Sep 11 23:33:31 2011 +0200 Trivial fixes around the code. * C90-fy. * Remove ASN comments. * Don't smartlist_clear() before smartlist_free(). * Plug a mem. leak. --- src/or/circuitbuild

[tor-commits] [tor/master] Update the transports.c documentation based on the new data.

commit a002f0e7c09dc664148a018fc69ac416789330dd Author: George Kadianakis Date: Sun Sep 11 20:29:52 2011 +0200 Update the transports.c documentation based on the new data. --- src/or/transports.c | 82 +++--- 1 files changed, 70 insertions(+),

[tor-commits] [tor/master] Remove connection_uses_transport() since it was unused.

commit 0dcf327248d9e971b2bad9fcd498c3b18f2f70c0 Author: George Kadianakis Date: Sun Sep 11 20:33:27 2011 +0200 Remove connection_uses_transport() since it was unused. --- src/or/connection.c | 11 --- src/or/connection.h |1 - 2 files changed, 0 insertions(+), 12 deletions(-)

[tor-commits] [tor/master] Be more defensive in get_transport_bindaddr().

commit 9a42ec685751b5c5fd21f33cd788810d997f0d6e Author: George Kadianakis Date: Sun Sep 11 21:33:02 2011 +0200 Be more defensive in get_transport_bindaddr(). Make sure that lines in get_transport_bindaddr() begin with the name of the transport and a space. --- src/or/config.c

[tor-commits] [tor/master] Improve how we access or_state_t.

commit 2703e41d8b6ffcad653af68a8261c22b5a1ed26f Author: George Kadianakis Date: Sun Sep 11 20:57:01 2011 +0200 Improve how we access or_state_t. * Use get_or_state()->VirtualOption instead of relying on config_find_option(), STRUCT_VAR_P and voodoo. --- src/or/config.c | 3

[tor-commits] [tor/master] Prepare circuitbuild.[ch] and config.[ch] for SIGHUPs.

commit fa514fb207f23cb6f0ade95bbd830834ea14811f Author: George Kadianakis Date: Sun Sep 11 20:28:47 2011 +0200 Prepare circuitbuild.[ch] and config.[ch] for SIGHUPs. * Create mark/sweep functions for transports. * Create a transport_resolve_conflicts() function that tries to

[tor-commits] [tor/master] Introduce tor_terminate_process() function.

commit 782810a8bf1fbc3feaca851a011a8124891d39fc Author: George Kadianakis Date: Sun Sep 11 20:26:01 2011 +0200 Introduce tor_terminate_process() function. --- src/common/util.c | 26 ++ src/common/util.h |1 + 2 files changed, 27 insertions(+), 0 deletions(-)

[tor-commits] [tor/master] Improve the code a tad.

commit db4cde38109c677db14316ac77c240d7d61db386 Author: George Kadianakis Date: Mon Aug 15 17:26:03 2011 +0200 Improve the code a tad. * Use strcmpstart() instead of strcmp(x,y,strlen(y)). * Warn the user if the managed proxy failed to launch. * Improve function documentati

[tor-commits] [tor/master] Update transports.[ch] to support SIGHUPs.

commit 1e92b24889bd64ccdd568366aaf989714d130f31 Author: George Kadianakis Date: Sun Sep 11 20:29:12 2011 +0200 Update transports.[ch] to support SIGHUPs. --- src/or/transports.c | 323 +++ src/or/transports.h | 42 +++- 2 files changed

[tor-commits] [tor/master] Spawn multiple protocols using a single managed proxy.

commit ea3e9416c6c579735ff2b844a88605ae5e1cbbd2 Author: George Kadianakis Date: Fri Aug 12 21:33:05 2011 +0200 Spawn multiple protocols using a single managed proxy. If multiple torrc transport lines have the same argv, tor instructs a single managed proxy to launch multiple pr

[tor-commits] [tor/master] Replaced some leftover assert()s with tor_assert()s.

commit c852760b80c4b7e06d775bafdb1f386d0e8ced63 Author: George Kadianakis Date: Sat Sep 10 00:45:28 2011 +0200 Replaced some leftover assert()s with tor_assert()s. --- src/or/circuitbuild.c |2 +- src/or/transports.c |5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) dif

[tor-commits] [tor/master] Reuse get_string_from_pipe() in log_from_pipe().

commit 69271b2a383f6fe53ed7d5ca21cc4bd89c25de17 Author: George Kadianakis Date: Mon Jul 18 17:06:16 2011 +0200 Reuse get_string_from_pipe() in log_from_pipe(). --- src/common/util.c | 91 +- src/or/transports.c |2 - 2 files changed,

[tor-commits] [tor/master] Let's be smarter while parsing {Client, Server}TransportPlugin lines.

commit 51cdd30c01c47e3522bd49a23a83a566cf4de5a7 Author: George Kadianakis Date: Mon Jul 18 16:42:31 2011 +0200 Let's be smarter while parsing {Client,Server}TransportPlugin lines. --- src/or/config.c | 64 +++--- src/or/transports.c |1

[tor-commits] [tor/master] Server transport proxies should bind on the same port each time, if possible.

commit 941709ee50654b9ef59836fadbd8c4e7029c9fc1 Author: George Kadianakis Date: Sun Aug 7 18:05:40 2011 +0200 Server transport proxies should bind on the same port each time, if possible. --- src/or/circuitbuild.c |2 +- src/or/config.c | 235 +++

[tor-commits] [tor/master] Changed a printf() to a log_debug().

commit cfb473ed348063e1f1abd709ac313f14d33cadf5 Author: George Kadianakis Date: Mon Jul 18 17:08:55 2011 +0200 Changed a printf() to a log_debug(). --- src/or/transports.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c in

[tor-commits] [tor/master] Replaced ST_* enum prefix for stream status with IO_STREAM_*.

commit 14c5a24fe74f7ebaf94c69721025f142d42ef1e0 Author: George Kadianakis Date: Mon Jul 18 02:35:29 2011 +0200 Replaced ST_* enum prefix for stream status with IO_STREAM_*. --- src/common/util.c | 18 +- src/common/util.h |8 src/or/transports.c |6 ++

[tor-commits] [tor/master] Renamed pluggable_transports.[ch] to transports.[ch].

commit d8c04c7ea52bc1ffbeec60d614970eccab3c9b4f Author: George Kadianakis Date: Mon Jul 18 02:19:38 2011 +0200 Renamed pluggable_transports.[ch] to transports.[ch]. --- src/or/pluggable_transports.c | 613 - src/or/pluggable_transports.h | 59

[tor-commits] [tor/master] Updated #includes etc. to use transports.[ch].

commit a8f21f91cfa916b662d07dd486857fdf848c6f1d Author: George Kadianakis Date: Mon Jul 18 02:33:31 2011 +0200 Updated #includes etc. to use transports.[ch]. --- src/or/Makefile.am|4 ++-- src/or/circuitbuild.c |2 +- src/or/config.c |2 +- src/or/main.c |

[tor-commits] [tor/master] Changed a couple of 180 spec stuff according to #3578.

commit 684aca7faffea93a8e3dcb2a582aa10797f71e7d Author: George Kadianakis Date: Thu Jul 14 01:03:35 2011 +0200 Changed a couple of 180 spec stuff according to #3578. * Restored "proxy" in external ServerTransportPlugin lines. * Changed the extended OR port and ORPort env. vars

[tor-commits] [tor/master] Reverting the accounting thing introduced in 5492de76 till I think how it should be done properly.

commit 86b20e0d8ac0cc87cf85e34666d6cd25a9657521 Author: George Kadianakis Date: Thu Jul 14 04:24:10 2011 +0200 Reverting the accounting thing introduced in 5492de76 till I think how it should be done properly. --- src/or/connection.c | 10 +++--- 1 files changed, 3 insertions(+), 7

[tor-commits] [tor/master] Add some unit tests.

commit ce419a78c56e38fedcb3bce66fc08283648aed9f Author: George Kadianakis Date: Wed Jul 13 19:06:14 2011 +0200 Add some unit tests. --- src/test/Makefile.am |1 + src/test/test.c |2 + src/test/test_pt.c | 149 ++ 3 files chan

[tor-commits] [tor/master] Put some last missing pieces together.

commit 5492de76dde34cb56c5658b6311772281c08c200 Author: George Kadianakis Date: Wed Jul 13 19:06:07 2011 +0200 Put some last missing pieces together. * Add some utility transport functions in circuitbuild.[ch] so that we can use them from pt.c. * Make the accounting syste

[tor-commits] [tor/master] Create the pluggable_transports.[ch] source files responsible for talking the 180 talk.

commit 9ba2d0e439e53f8307c808fe26e37b53892a604c Author: George Kadianakis Date: Wed Jul 13 19:00:28 2011 +0200 Create the pluggable_transports.[ch] source files responsible for talking the 180 talk. --- src/or/Makefile.am|2 + src/or/pluggable_transports.c | 613 +

[tor-commits] [tor/master] Make some utility functions.

commit 810a7a5fa0973451881a874a08594937a8274429 Author: George Kadianakis Date: Wed Jul 13 18:59:52 2011 +0200 Make some utility functions. * Create a function that will get input from a stream, so that we can communicate with the managed proxy. * Hackish change to tor_sp

[tor-commits] [tor/master] Add support for managed {Client, Server}TransportPlugin parsing.

commit 73a1e98cb971f7d1105f2b6b2399ae2eeec36a96 Author: George Kadianakis Date: Wed Jul 13 18:58:11 2011 +0200 Add support for managed {Client,Server}TransportPlugin parsing. --- src/or/config.c | 219 --- src/or/or.h |3 + 2 fil

[tor-commits] [vidalia/master] Bump version to 0.2.15-git

commit 30139eca796d9e1cc82a3aac4c8ae12bedce7d02 Author: Tomás Touceda Date: Sat Sep 10 16:42:22 2011 -0300 Bump version to 0.2.15-git --- CMakeLists.txt |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18f2575..6906313 10064

[tor-commits] [vidalia/master] Version bump and fold in changes for 0.2.15 release

commit 1de8f44b56f6d8c8632754e3d2e2282c1995a045 Author: Tomás Touceda Date: Fri Oct 7 15:56:03 2011 -0300 Version bump and fold in changes for 0.2.15 release --- CHANGELOG | 18 ++ CMakeLists.txt |2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --g

[tor-commits] [vidalia/master] Merge branch 'bug3759_basiclog_backport'

commit 764b202fcc299731eb09dc7a8f95d22582908e07 Merge: 30139ec 19f605c Author: Tomás Touceda Date: Fri Sep 16 11:23:33 2011 -0300 Merge branch 'bug3759_basiclog_backport' changes/bug3759 |3 +++ src/vidalia/log/StatusEventItem.cpp | 12 ++-- src/vida

[tor-commits] [vidalia/master] Merge branch 'feat2163_osxicons'

commit a402fe2f17a57bac80df772bd209b875e92ead6c Merge: 928e8ba 5af6c27 Author: Tomás Touceda Date: Fri Sep 9 10:47:53 2011 -0300 Merge branch 'feat2163_osxicons' changes/feat2163 |2 + src/vidalia/CMakeLists.txt |6 +++ src/vidalia/HelperProcess.

[tor-commits] [vidalia/master] Fix the text layout in the CHANGELOG a bit

commit 8966ecdfff58de6c5beeccea4578dddc9dfde242 Author: Tomás Touceda Date: Fri Oct 7 16:16:56 2011 -0300 Fix the text layout in the CHANGELOG a bit --- CHANGELOG |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9803ecf..23c1c23 100

[tor-commits] [vidalia/master] Add the missing plist file

commit 08e9adf80ae2fffa6b2bf34685f281e81e7c3120 Author: Tomás Touceda Date: Tue Oct 4 15:43:53 2011 -0300 Add the missing plist file --- src/vidalia/MacOSXBundleInfo.plist.in | 38 + 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/src/vida

[tor-commits] [vidalia/master] Merge branch 'bug3843_checkauto'

commit 0a369b233523366c484761296c8b9369598dadbd Merge: a402fe2 e43e1c9 Author: Tomás Touceda Date: Fri Sep 9 10:48:02 2011 -0300 Merge branch 'bug3843_checkauto' changes/bug3843 |2 ++ src/vidalia/MainWindow.cpp | 20 +--- src/vidalia/co

[tor-commits] [vidalia/master] Make the definition of IconDisplayPreference crossplatform

commit 09b8c0ba4dfa8b06d3c1e27c7fde90426e2a8a6f Author: Tomás Touceda Date: Sat Sep 10 16:40:48 2011 -0300 Make the definition of IconDisplayPreference crossplatform --- src/vidalia/config/VidaliaSettings.cpp |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/vi

[tor-commits] [vidalia/master] Merge branch 'feat2644_backport'

commit 928e8ba257a101f7cd59dc828ab2d8a5bda157db Merge: 4a084f1 2ec2ae2 Author: Tomás Touceda Date: Fri Sep 9 10:47:19 2011 -0300 Merge branch 'feat2644_backport' changes/bug2644 |3 + src/vidalia/config/ServerPage.cpp | 99 -

[tor-commits] [vidalia/master] Merge branch 'bug2188_bwgraph'

commit 550fc048733a0d062a7f6e131b789c20ba630ecc Merge: 0a369b2 86ec8d9 Author: Tomás Touceda Date: Fri Sep 9 10:48:09 2011 -0300 Merge branch 'bug2188_bwgraph' changes/bug2188|2 + src/vidalia/bwgraph/GraphFrame.cpp | 45 ++- src/

[tor-commits] [vidalia/master] Revert the disable checkboxes idea for usability issues

commit 0bbd224041d764ecd7fd8caebe73b5f5feb9fe5e Author: Tomas Touceda Date: Tue May 3 16:52:43 2011 -0300 Revert the disable checkboxes idea for usability issues The tab is disabled for both bridge and non-exit to be more clear about the fact that exit policies don't apply.

[tor-commits] [vidalia/master] Merge branch 'bug3342_time'

commit 59da70abeb09540cf26e59e9a343a97638fa931a Merge: 550fc04 3e2eed6 Author: Tomás Touceda Date: Fri Sep 9 10:48:18 2011 -0300 Merge branch 'bug3342_time' changes/bug3342 |2 ++ src/vidalia/config/ServerPage.cpp |3 +++ 2 files changed, 5 insertions(+), 0 dele

[tor-commits] [vidalia/master] Add a changes file

commit 86ec8d91fa6b72aa11f9c7bf500f95a93cfb239d Author: Tomás Touceda Date: Wed Sep 7 15:06:04 2011 -0300 Add a changes file --- changes/bug2188 |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug2188 b/changes/bug2188 new file mode 100644 index 000..

[tor-commits] [vidalia/master] Add a changes file

commit 3e2eed6a1c761f08c79d59371b009c528b61961e Author: Tomás Touceda Date: Wed Sep 7 15:08:49 2011 -0300 Add a changes file --- changes/bug3342 |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug3342 b/changes/bug3342 new file mode 100644 index 000..

[tor-commits] [vidalia/master] Add a changes file

commit 19f605cabab8f3ceb0f667db327f56688f98849d Author: Tomás Touceda Date: Wed Sep 7 13:44:46 2011 -0300 Add a changes file --- changes/bug3759 |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug3759 b/changes/bug3759 new file mode 100644 index 000.

[tor-commits] [vidalia/master] Add a changes file

commit 5af6c278c1b076bc93bcd8d3f66998a454598f39 Author: Tomás Touceda Date: Wed Sep 7 15:03:47 2011 -0300 Add a changes file --- changes/feat2163 |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/feat2163 b/changes/feat2163 new file mode 100644 index 00

[tor-commits] [vidalia/master] Change QTime for QDateTime in StatusEventWidget/Item

commit 5e0de05b039b3e23b5287c92dd169c0784856ca6 Author: Tomás Touceda Date: Wed Sep 7 12:21:41 2011 -0300 Change QTime for QDateTime in StatusEventWidget/Item --- src/vidalia/log/StatusEventItem.cpp | 12 ++-- src/vidalia/log/StatusEventItem.h |6 +++--- src/vidalia/lo

[tor-commits] [vidalia/master] Add a changes file

commit 2ec2ae2c7618476f690ca3d769cee1efff8a30c5 Author: Tomás Touceda Date: Wed Sep 7 15:01:26 2011 -0300 Add a changes file --- changes/bug2644 |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug2644 b/changes/bug2644 new file mode 100644 index 000.

[tor-commits] [vidalia/master] Adds a changes file

commit e43e1c9b7a4c26fc68aed4ade04184ab8ed4d333 Author: Tomás Touceda Date: Wed Sep 7 13:57:11 2011 -0300 Adds a changes file --- changes/bug3843 |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug3843 b/changes/bug3843 new file mode 100644 index 000.

[tor-commits] [vidalia/master] Improve Jason's patch with Matt's suggestions

commit 1a4249ab2e678349c508dc1d6bdbf85a638d311b Author: Tomás Touceda Date: Thu Sep 1 15:56:39 2011 -0300 Improve Jason's patch with Matt's suggestions --- pkg/osx/MacOSXBundleInfo.plist.in | 38 src/vidalia/CMakeLists.txt |7 -

[tor-commits] [vidalia/master] Implement Icon Preference (appearance setting) in OSX (see #2163)

commit 4df4ee18c1acbc9fdad4e2395a8384190ff420db Author: Jason Klein Date: Sun Apr 17 17:13:25 2011 -0500 Implement Icon Preference (appearance setting) in OSX (see #2163) Updated the Appearance settings page to include an Icon Preference group box with three new radio options:

[tor-commits] [vidalia/master] Improve a bit the string formatting

commit ed1bd21a28737bee2210b22b86a0d9c96a41f053 Author: Tomás Touceda Date: Tue Aug 30 20:44:49 2011 -0300 Improve a bit the string formatting --- src/vidalia/MainWindow.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/

[tor-commits] [vidalia/master] Backport the new ServerPage to master

commit bb16e81f0906a209340533c1a38bbec0b2774de3 Author: Tomás Touceda Date: Thu Sep 1 13:51:24 2011 -0300 Backport the new ServerPage to master --- src/vidalia/config/ServerPage.cpp | 99 - src/vidalia/config/ServerPage.ui | 17 -- src/vida

[tor-commits] [vidalia/master] Check if autoconfiguration failed because tor died

commit da4b003b22680968429c317559f9fea0dd7f2b3b Author: Tomás Touceda Date: Tue Aug 30 20:05:17 2011 -0300 Check if autoconfiguration failed because tor died --- src/vidalia/MainWindow.cpp | 12 +--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/vidalia/Main

[tor-commits] [vidalia/master] Add more checks to make the controlport auto config better

commit 0bd00acdb7bdefc5df31f20c0579632cf3ec0875 Author: Tomás Touceda Date: Mon Aug 29 18:41:12 2011 -0300 Add more checks to make the controlport auto config better It checks if DataDirectory is empty, and disables the feature in such case. It also checks the tor version and

[tor-commits] [vidalia/master] Force qdatetime to be UTC before converting to LocalTime

commit 02765836b3b284fea26a30d9baa05e05b0fcf12f Author: Tomas Touceda Date: Thu Jun 2 23:00:48 2011 -0300 Force qdatetime to be UTC before converting to LocalTime --- src/vidalia/config/ServerPage.cpp |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/vidalia/co

[tor-commits] [vidalia/master] Compute max with only the visible points in bwgraph

commit a08aa988a29ffa4d6db93250fe7589cd61395e09 Author: Tomas Touceda Date: Sat May 21 14:43:41 2011 -0300 Compute max with only the visible points in bwgraph If the max is global instead of local, a peak in the connection will make the rest of the graph too small. --- src/vid

[tor-commits] [translation/vidalia_installer] Update translations for vidalia_installer

commit 7c93a54c436ef74578560ff53b9c17d251738b72 Author: Translation commit bot Date: Fri Oct 7 18:34:26 2011 + Update translations for vidalia_installer --- templates/vidalia.pot | 195 1 files changed, 130 insertions(+), 65 deletions(-

[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'asn/bug3437_v2'

commit 70cb7afcffc3fda3cad8a90325c6cd5b4d519736 Merge: c19ced7 c66f3f5 Author: Nick Mathewson Date: Fri Oct 7 13:17:45 2011 -0400 Merge remote-tracking branch 'asn/bug3437_v2' src/managed.c |2 ++ src/sha256.c |5 - 2 files changed, 6 insertions(+), 1 deletions(-) __

[obfsproxy/master] Make it compile on Windows™.

commit c66f3f58b3740b9380e5cc466eeefb808249c6cd Author: George Kadianakis Date: Fri Oct 7 16:00:47 2011 +0200 Make it compile on Windows™. --- src/managed.c |2 ++ src/sha256.c |5 - 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/managed.c b/src/managed.c

[tor-commits] [arm/master] fix: fixing tor process detection for openbsd

commit 84cd622e515c97d0c9b0d9779204155978926e9d Author: Damian Johnson Date: Fri Oct 7 09:18:14 2011 -0700 fix: fixing tor process detection for openbsd OpenBSD uses a different variant of ps causing the tor process detection (among many other things) to fail. Caught thanks to

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

commit 98e5c63eb254cb4b744281b75093c4bd7f73b6c6 Merge: 2725a88 6d027a3 Author: Nick Mathewson Date: Fri Oct 7 12:20:08 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4201 |5 + src/or/main.c |2 +- 2 files changed, 6 insertions(+), 1 deletions(-) __

[tor-commits] [tor/master] Avoid running DNS self-tests if we're operating as a bridge

commit 6d027a3823843030fc24d7224da3ca976f121b01 Author: warms0x Date: Fri Oct 7 07:04:29 2011 + Avoid running DNS self-tests if we're operating as a bridge --- changes/bug4201 |5 + src/or/main.c |2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/change

[tor-commits] [tor/maint-0.2.2] Avoid running DNS self-tests if we're operating as a bridge

commit 6d027a3823843030fc24d7224da3ca976f121b01 Author: warms0x Date: Fri Oct 7 07:04:29 2011 + Avoid running DNS self-tests if we're operating as a bridge --- changes/bug4201 |5 + src/or/main.c |2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/change

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

commit f1000ba21ad65ce9a824f40af9034f100f9ca676 Author: Translation commit bot Date: Fri Oct 7 13:33:22 2011 + Update translations for vidalia_help --- es/services.po | 22 +- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/es/services.po b/es/serv

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

commit 2dc6d7356a2f0d3449875208098606346f0aaf99 Author: Translation commit bot Date: Fri Oct 7 13:02:15 2011 + Update translations for vidalia_help --- es/services.po | 13 ++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/es/services.po b/es/services.po i

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

commit 070fe55f7d83885e42f94a90ddd4142bd878d99c Author: Translation commit bot Date: Fri Oct 7 12:32:35 2011 + Update translations for vidalia_help --- es/services.po | 13 + 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/es/services.po b/es/services.po in

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

commit 0d4157579f5e7496ad6689a2b59c65313050a685 Author: Translation commit bot Date: Fri Oct 7 11:00:38 2011 + Update translations for vidalia_help --- es/services.po | 15 +-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/es/services.po b/es/services.po

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

commit ea9ed935b70615063680bb0e2600130168ada6b3 Author: Translation commit bot Date: Fri Oct 7 09:00:37 2011 + Update translations for vidalia_help --- es/log.po | 32 +- es/services.po | 68 --- 2 fil

[tor-commits] [translation/vidalia_help] Update translations for vidalia_help

commit f7c3341957d8a6a2656db642b555a9671a61b133 Author: Translation commit bot Date: Fri Oct 7 08:16:44 2011 + Update translations for vidalia_help --- es/log.po | 135 - 1 files changed, 89 insertions(+), 46 deletions(-) di