[tor-commits] [tor/master] Use tor_malloc_zero() in var_cell_new().

2012-09-06 Thread nickm
commit 8284c2bcba4d8daecf5416fa88324212c5fc17ea Author: George Kadianakis desnac...@riseup.net Date: Thu Sep 6 01:22:32 2012 +0300 Use tor_malloc_zero() in var_cell_new(). This is just a precaution; we seem to be using var_cell_t.payload and var_cell_t.payload_len correctly at

[tor-commits] [tor/master] Log more information when we fail to terminate a process.

2012-09-06 Thread nickm
commit 93c38b679f01bba7d85ddf5eeac51c462e782a62 Author: George Kadianakis desnac...@riseup.net Date: Thu Sep 6 17:03:11 2012 +0300 Log more information when we fail to terminate a process. --- src/common/util.c | 11 --- 1 files changed, 8 insertions(+), 3 deletions(-) diff

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

2012-09-06 Thread nickm
commit deee0b67c3171cf4a6c7cf9c64c642d882b39880 Merge: 0012054 8284c2b Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 6 10:12:11 2012 -0400 Merge remote-tracking branch 'asn/bug6765' src/or/connection_or.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

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

2012-09-06 Thread nickm
commit d2d7cab5b83e49aba4ae8ecf0aabb9dfcda8d31e Merge: deee0b6 93c38b6 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 6 10:12:15 2012 -0400 Merge remote-tracking branch 'asn/bug6779' src/common/util.c | 11 --- 1 files changed, 8 insertions(+), 3 deletions(-)

[tor-commits] [torspec/master] Make tor-fw-helper port-purpose-agnostic.

2012-09-06 Thread nickm
commit 43c37b1113cd42b9818236a75660b896e16e6324 Author: George Kadianakis desnac...@riseup.net Date: Mon Jun 11 19:51:54 2012 +0300 Make tor-fw-helper port-purpose-agnostic. --- tor-fw-helper-spec.txt | 38 +- 1 files changed, 25 insertions(+), 13

[tor-commits] [torspec/master] Merge remote-tracking branch 'asn-gitorious/bug6059'

2012-09-06 Thread nickm
commit e5e36e4acabc2914799f96de70bd649f8b80667d Merge: 5cb 43c37b1 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 6 10:14:09 2012 -0400 Merge remote-tracking branch 'asn-gitorious/bug6059' tor-fw-helper-spec.txt | 38 +- 1 files

[tor-commits] [tor/master] Implement the new TCP port parsing logic in tor-fw-helper.

2012-09-06 Thread nickm
commit d7261fb7f1ac6892b034ea47cdf59577188af93f Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 7 00:43:20 2012 +0300 Implement the new TCP port parsing logic in tor-fw-helper. --- src/tools/tor-fw-helper/tor-fw-helper.c | 56 +++ 1 files changed,

[tor-commits] [tor/master] Refactor tor-fw-helper port forwarding logic.

2012-09-06 Thread nickm
commit d19a78744e287d48df36e9946b021dbf1987bbce Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 7 18:26:27 2012 +0300 Refactor tor-fw-helper port forwarding logic. Make it port-purpose-agnostic; that is it should treat each port as equal, and not expect to get a

[tor-commits] [tor/master] Further implement tor-fw-helper's TCP port forwarding system.

2012-09-06 Thread nickm
commit c5778553dc5a5c2f61dc6689a1041364a94e0eca Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 7 00:48:08 2012 +0300 Further implement tor-fw-helper's TCP port forwarding system. --- src/tools/tor-fw-helper/tor-fw-helper.c | 160 --- 1 files

[tor-commits] [tor/master] Refactor our backends' interface.

2012-09-06 Thread nickm
commit b9e160446a9fcc5c840694ea6eee3c23217bcd19 Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 7 00:56:23 2012 +0300 Refactor our backends' interface. --- src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 30 -- src/tools/tor-fw-helper/tor-fw-helper-natpmp.h

[tor-commits] [tor/master] All loging messages are now sent to stderr.

2012-09-06 Thread nickm
commit e8be040016a279d5cbef38fa5328cc2eb0de2c46 Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 7 00:59:20 2012 +0300 All loging messages are now sent to stderr. stdout should be clean for control messages. --- src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 28

[tor-commits] [tor/master] Introduce get_lines_from_handle().

2012-09-06 Thread nickm
commit 03e89f0b72ede5ec37c76de840f04579b8d118c3 Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 7 19:07:13 2012 +0300 Introduce get_lines_from_handle(). get_lines_from_handle() is a multiplatform function which drains lines from a stream and stuffs it into a

[tor-commits] [tor/master] Use get_lines_from_handle() in configure_proxy().

2012-09-06 Thread nickm
commit 64b2a64310a66a3e22403917ecdef38263ba0483 Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 7 19:09:31 2012 +0300 Use get_lines_from_handle() in configure_proxy(). --- src/or/transports.c | 86 --- 1 files changed, 13

[tor-commits] [tor/master] Tweak code and pump the tor-fw-helper version.

2012-09-06 Thread nickm
commit 443260ffd8370c0fddefad42479b957132e8d275 Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 7 19:24:31 2012 +0300 Tweak code and pump the tor-fw-helper version. Conflicts: src/or/circuitbuild.h --- src/or/circuitbuild.h |4

[tor-commits] [tor/master] Refactor tor to support the new tor-fw-helper protocol.

2012-09-06 Thread nickm
commit cd05f35d2cdf50d31108428cf5c19549d468dbc0 Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 7 19:16:18 2012 +0300 Refactor tor to support the new tor-fw-helper protocol. Add handle_fw_helper_output(), a function responsible for parsing the output of

[tor-commits] [tor/master] Start passing ports to tor_check_port_forwarding().

2012-09-06 Thread nickm
commit da16c425ef8c17a753ae0abc3fdb26a328004062 Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 7 19:20:36 2012 +0300 Start passing ports to tor_check_port_forwarding(). Conflicts: src/or/transports.c --- src/or/config.c | 35

[tor-commits] [tor/master] Fix some bugs that did not allow compilation on Windows.

2012-09-06 Thread nickm
commit b9551fd0741434e9d0917355d67164775eb25fbe Author: George Kadianakis desnac...@riseup.net Date: Tue Aug 21 20:56:30 2012 +0300 Fix some bugs that did not allow compilation on Windows. --- src/common/util.c | 14 +++---

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

2012-09-06 Thread nickm
commit e9684405acf5d3bbfa3c2d4f70332cef3c66d553 Merge: d2d7cab 4edc57c Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 6 10:12:28 2012 -0400 Merge remote-tracking branch 'asn/bug4567_rebased' changes/bug4567|3 + changes/bug4567_2

[tor-commits] [tor/master] Figure out ORPort and DirPort even when 'auto' is used.

2012-09-06 Thread nickm
commit 4edc57caa5c4a7d4d46d30bf0150a7f70e8dcccb Author: George Kadianakis desnac...@riseup.net Date: Wed Sep 5 20:17:25 2012 +0300 Figure out ORPort and DirPort even when 'auto' is used. Use router_get_advertised_{dir,or}_port() functions instead of get_primary_{dir,or}_port().

[tor-commits] [tor/master] General tweaks and fixes for Nick's comments.

2012-09-06 Thread nickm
commit 44fe717524408d247ab10e3794438232d81d66dc Author: George Kadianakis desnac...@riseup.net Date: Fri Jun 29 19:32:34 2012 +0300 General tweaks and fixes for Nick's comments. * Add changes/ files. * Edit the tor-fw-helper manpage. * Fix check-spaces. * Add prototype

[tor-commits] [tor/master] Fix a dependency: sha256.c influences crypto.o, not crypto.c

2012-09-06 Thread nickm
commit 5d162d5a7b6b8ce9075cd6987cc6cda119b433ff Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 6 10:03:06 2012 -0400 Fix a dependency: sha256.c influences crypto.o, not crypto.c --- changes/bug6778 |1 + src/common/include.am |2 +- 2 files changed, 2

[tor-commits] [tor/master] Fix a dependency: micro-revision.i influences tor_main.o, not tor_main.c

2012-09-06 Thread nickm
commit 30fe9080e70aa2ebdf1c2bf86e98fe46b1ad27e1 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 6 11:00:32 2012 -0400 Fix a dependency: micro-revision.i influences tor_main.o, not tor_main.c --- changes/bug6778 |4 +++- src/or/include.am |2 +- 2 files changed, 4

[tor-commits] [tor/master] Fix a build-warning when building out-of-tree

2012-09-06 Thread nickm
commit 91fed2c7037acf3f154ab0a4a536bc1579c1ccfa Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 6 09:56:48 2012 -0400 Fix a build-warning when building out-of-tree We were trying to incorporate all headers in common_sha1.i, not just the src/common ones. This

[tor-commits] [tor/master] Merge branch 'bug6778'

2012-09-06 Thread nickm
commit ad1e8b45df3933e6f01098a5f9ba6238adafc9c2 Merge: e968440 30fe908 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 6 11:05:16 2012 -0400 Merge branch 'bug6778' changes/bug6778 |6 ++ src/common/include.am | 12 +++- src/or/include.am | 15

[tor-commits] [tor/master] Merge branch 'quiet_lib_versions_squashed'

2012-09-06 Thread nickm
commit 1ca9e2685f6cea803ff1a36c7dbe05625e9c4b61 Merge: ad1e8b4 7607ad2 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 6 11:32:09 2012 -0400 Merge branch 'quiet_lib_versions_squashed' changes/detect_openssl_mismatch |4 changes/quiet_lib_init |3 +++

[tor-commits] [tor/master] Rename config_alloc() -- _new().

2012-09-06 Thread nickm
commit 3327a0a61cfaca07c3c20533d23a2599735e094f Author: Linus Nordberg li...@torproject.org Date: Mon Sep 3 14:45:24 2012 +0200 Rename config_alloc() -- _new(). --- src/or/config.c |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/config.c

[tor-commits] [tor/master] Rename packed_cell_alloc() -- _new().

2012-09-06 Thread nickm
commit 09c84b50e71a7c65f1b891e396bb9ad811588dad Author: Linus Nordberg li...@torproject.org Date: Mon Sep 3 14:49:31 2012 +0200 Rename packed_cell_alloc() -- _new(). --- src/or/relay.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/relay.c

[tor-commits] [tor/master] Rename extend_info_alloc() -- _new()

2012-09-06 Thread nickm
commit f4cf279eb58f5d0a61f603bd961b58e51cd82bc3 Author: Nick Mathewson ni...@torproject.org Date: Thu Sep 6 11:38:32 2012 -0400 Rename extend_info_alloc() -- _new() Based on a patch from Linus, regenerated so as to not conflict with Linus's 5535/6363 patches. ---

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

2012-09-06 Thread translation
commit c5541be8c3b65f5a19c91ca437760aa31b7413e0 Author: Translation commit bot translat...@torproject.org Date: Thu Sep 6 20:15:20 2012 + Update translations for vidalia_help --- sk/running.po | 15 +++ 1 files changed, 7 insertions(+), 8 deletions(-) diff --git

[tor-commits] r25783: {website} update me0w and overall mirror status. (in website/trunk: . include)

2012-09-06 Thread Andrew Lewman
Author: phobos Date: 2012-09-06 20:26:50 + (Thu, 06 Sep 2012) New Revision: 25783 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update me0w and overall mirror status. Modified: website/trunk/include/mirrors-table.wmi

[tor-commits] [flashproxy/master] Add SSLCertificateChainFile to facilitator-howto.txt.

2012-09-06 Thread dcf
commit 074d8349e46128240de8cc09f420f7a145f6475f Author: David Fifield da...@bamsoftware.com Date: Thu Sep 6 16:17:36 2012 -0700 Add SSLCertificateChainFile to facilitator-howto.txt. --- doc/facilitator-howto.txt |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git

[tor-commits] [torbrowser/maint-2.3] Remove the image cache patch from this branch.

2012-09-06 Thread mikeperry
commit e73d1f387758569e1b2d2031955ea53453c587c5 Author: Mike Perry mikeperry-...@fscked.org Date: Wed Aug 29 13:25:47 2012 -0700 Remove the image cache patch from this branch. --- ...solate-the-Image-Cache-per-url-bar-domain.patch | 910 1 files changed, 0

[tor-commits] [torbrowser/maint-2.3] Merge remote-tracking branch 'mikeperry/firefox15-noisolate' into maint-2.3

2012-09-06 Thread mikeperry
commit 1542586f2326c48a0fa4a819e4bf4d631163b223 Merge: 196ebd2 e73d1f3 Author: Mike Perry mikeperry-...@fscked.org Date: Thu Sep 6 18:44:53 2012 -0700 Merge remote-tracking branch 'mikeperry/firefox15-noisolate' into maint-2.3 ...nents.interfaces-lookupMethod-from-conten.patch | 10 +-

[tor-commits] [torbrowser/maint-2.3] Forgot to git add some files in the patches

2012-09-06 Thread mikeperry
commit 5ccf2e7f6b0f1924059a9fc69dc1dc41583ed13e Author: Mike Perry mikeperry-...@fscked.org Date: Wed Aug 29 13:20:11 2012 -0700 Forgot to git add some files in the patches --- ...Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch | 138 ++--