tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[flashproxy/master] Add --transport to man pages.
by dcf＠torproject.org 10 Oct '13

10 Oct '13

commit 7436c60fceb5e43ed98042061625323050106921 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 9 23:30:57 2013 -0700 Add --transport to man pages. --- doc/flashproxy-client.1 | 7 +++++++ doc/flashproxy-client.1.txt | 3 +++ doc/flashproxy-reg-appspot.1 | 11 +++++++++-- doc/flashproxy-reg-appspot.1.txt | 3 +++ doc/flashproxy-reg-email.1 | 11 +++++++++-- doc/flashproxy-reg-email.1.txt | 3 +++ doc/flashproxy-reg-http.1 | 11 +++++++++-- doc/flashproxy-reg-http.1.txt | 3 +++ doc/flashproxy-reg-url.1 | 13 ++++++++++--- doc/flashproxy-reg-url.1.txt | 3 +++ 10 files changed, 59 insertions(+), 9 deletions(-) diff --git a/doc/flashproxy-client.1 b/doc/flashproxy-client.1 index 27e6b5f..74b0d30 100644 --- a/doc/flashproxy-client.1 +++ b/doc/flashproxy-client.1 @@ -135,6 +135,13 @@ Register using the given comma\-separated list of methods\&. Implies \fB\-\-register\fR\&. Possible methods are: appspot, email, http\&. Default is "appspot,email,http"\&. .RE .PP +\fB\-\-transport\fR=\fITRANSPORT\fR +.RS 4 +Registrations include the fact that you intend to use the given +\fITRANSPORT\fR +(default "websocket")\&. +.RE +.PP \fB\-\-unsafe\-logging\fR .RS 4 Don\(cqt scrub IP addresses from logs\&. diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt index 89a32b5..b4779a2 100644 --- a/doc/flashproxy-client.1.txt +++ b/doc/flashproxy-client.1.txt @@ -89,6 +89,9 @@ OPTIONS Register using the given comma-separated list of methods. Implies **--register**. Possible methods are: appspot, email, http. Default is "appspot,email,http". +**--transport**=__TRANSPORT__:: + Registrations include the fact that you intend to use the given __TRANSPORT__ (default "websocket"). + **--unsafe-logging**:: Don't scrub IP addresses from logs. diff --git a/doc/flashproxy-reg-appspot.1 b/doc/flashproxy-reg-appspot.1 index e77394b..9af7346 100644 --- a/doc/flashproxy-reg-appspot.1 +++ b/doc/flashproxy-reg-appspot.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-reg-appspot .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 10/09/2013 +.\" Date: 10/10/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-APPSPOT" "1" "10/09/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-APPSPOT" "1" "10/10/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -66,6 +66,13 @@ Encrypt registrations to the given PEM\-formatted public key (default built\-in) Display help message and exit\&. .RE .PP +\fB\-\-transport\fR=\fITRANSPORT\fR +.RS 4 +Registrations include the fact that you intend to use the given +\fITRANSPORT\fR +(default "websocket")\&. +.RE +.PP \fB\-\-unsafe\-logging\fR .RS 4 Don\(cqt scrub IP addresses from logs\&. diff --git a/doc/flashproxy-reg-appspot.1.txt b/doc/flashproxy-reg-appspot.1.txt index 55e781d..9b5a124 100644 --- a/doc/flashproxy-reg-appspot.1.txt +++ b/doc/flashproxy-reg-appspot.1.txt @@ -47,6 +47,9 @@ OPTIONS **-h**, **--help**:: Display help message and exit. +**--transport**=__TRANSPORT__:: + Registrations include the fact that you intend to use the given __TRANSPORT__ (default "websocket"). + **--unsafe-logging**:: Don't scrub IP addresses from logs. diff --git a/doc/flashproxy-reg-email.1 b/doc/flashproxy-reg-email.1 index 1adb60e..eac32cc 100644 --- a/doc/flashproxy-reg-email.1 +++ b/doc/flashproxy-reg-email.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-reg-email .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 10/09/2013 +.\" Date: 10/10/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-EMAIL" "1" "10/09/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-EMAIL" "1" "10/10/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -85,6 +85,13 @@ Display help message and exit\&. Use the given SMTP server (default is "gmail\-smtp\-in\&.l\&.google\&.com:25")\&. .RE .PP +\fB\-\-transport\fR=\fITRANSPORT\fR +.RS 4 +Registrations include the fact that you intend to use the given +\fITRANSPORT\fR +(default "websocket")\&. +.RE +.PP \fB\-\-unsafe\-logging\fR .RS 4 Don\(cqt scrub IP addresses from logs\&. diff --git a/doc/flashproxy-reg-email.1.txt b/doc/flashproxy-reg-email.1.txt index 90a2e49..1adc242 100644 --- a/doc/flashproxy-reg-email.1.txt +++ b/doc/flashproxy-reg-email.1.txt @@ -58,6 +58,9 @@ OPTIONS **-s**, **--smtp**=__HOST__[:__PORT__]:: Use the given SMTP server (default is "gmail-smtp-in.l.google.com:25"). +**--transport**=__TRANSPORT__:: + Registrations include the fact that you intend to use the given __TRANSPORT__ (default "websocket"). + **--unsafe-logging**:: Don't scrub IP addresses from logs. diff --git a/doc/flashproxy-reg-http.1 b/doc/flashproxy-reg-http.1 index a56d5a0..ea88705 100644 --- a/doc/flashproxy-reg-http.1 +++ b/doc/flashproxy-reg-http.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-reg-http .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 10/09/2013 +.\" Date: 10/10/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-HTTP" "1" "10/09/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-HTTP" "1" "10/10/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -57,6 +57,13 @@ Register with the given facilitator (default "https://fp\-facilitator\&.org/")\& Display help message and exit\&. .RE .PP +\fB\-\-transport\fR=\fITRANSPORT\fR +.RS 4 +Registrations include the fact that you intend to use the given +\fITRANSPORT\fR +(default "websocket")\&. +.RE +.PP \fB\-\-unsafe\-logging\fR .RS 4 Don\(cqt scrub IP addresses from logs\&. diff --git a/doc/flashproxy-reg-http.1.txt b/doc/flashproxy-reg-http.1.txt index ca1f801..cae719c 100644 --- a/doc/flashproxy-reg-http.1.txt +++ b/doc/flashproxy-reg-http.1.txt @@ -33,6 +33,9 @@ OPTIONS **-h**, **--help**:: Display help message and exit. +**--transport**=__TRANSPORT__:: + Registrations include the fact that you intend to use the given __TRANSPORT__ (default "websocket"). + **--unsafe-logging**:: Don't scrub IP addresses from logs. diff --git a/doc/flashproxy-reg-url.1 b/doc/flashproxy-reg-url.1 index e8a5cd2..ec3cf1d 100644 --- a/doc/flashproxy-reg-url.1 +++ b/doc/flashproxy-reg-url.1 @@ -1,13 +1,13 @@ '\" t .\" Title: flashproxy-reg-url .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 04/30/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/09/2013 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-URL" "1" "04/30/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-URL" "1" "10/09/2013" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -51,6 +51,13 @@ Encrypt registrations to the given PEM\-formatted public key (default built\-in) .RS 4 Display help message and exit\&. .RE +.PP +\fB\-\-transport\fR=\fITRANSPORT\fR +.RS 4 +Registrations include the fact that you intend to use the given +\fITRANSPORT\fR +(default "websocket")\&. +.RE .SH "EXAMPLE" .sp Say you wish to register 192\&.0\&.2\&.1:9000\&. Run diff --git a/doc/flashproxy-reg-url.1.txt b/doc/flashproxy-reg-url.1.txt index e69cd69..42757c9 100644 --- a/doc/flashproxy-reg-url.1.txt +++ b/doc/flashproxy-reg-url.1.txt @@ -31,6 +31,9 @@ OPTIONS **-h**, **--help**:: Display help message and exit. +**--transport**=__TRANSPORT__:: + Registrations include the fact that you intend to use the given __TRANSPORT__ (default "websocket"). + EXAMPLE ------- Say you wish to register 192.0.2.1:9000. Run

1 0

[check/master] Add Last-Modified header to bulk exit list.
by arlo＠torproject.org 10 Oct '13

10 Oct '13

commit e76ca136419cf7802ac172221dc80fd765ea1ba7 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 10 10:43:25 2013 -0700 Add Last-Modified header to bulk exit list. --- handlers.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/handlers.go b/handlers.go index cd8e815..3a91087 100644 --- a/handlers.go +++ b/handlers.go @@ -117,6 +117,8 @@ func BulkHandler(Layout *template.Template, Exits *Exits, domain *gettext.Domain port, port_str := GetQS(q, "port", 80) n, n_str := GetQS(q, "n", 16) + w.Header().Set("Last-Modified", Exits.UpdateTime.UTC().Format(http.TimeFormat)) + str := fmt.Sprintf("# This is a list of all Tor exit nodes from the past %d hours that can contact %s on port %d #\n", n, ip, port) str += fmt.Sprintf("# You can update this list by visiting https://check.torproject.org/cgi-bin/TorBulkExitList.py?ip=%s%s%s #\n", ip, port_str, n_str) str += fmt.Sprintf("# This file was generated on %v #\n", Exits.UpdateTime.UTC().Format(time.UnixDate))

1 0

[stem/master] Revert "Chaching version comparison and hash function"
by atagar＠torproject.org 10 Oct '13

10 Oct '13

commit 94b4924a3970fe3877b276ad2d07ccd149ed8d3a Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Oct 10 08:51:59 2013 -0700 Revert "Chaching version comparison and hash function" Wow, shame on me for not even running unit tests. This causes version comparisons to infinitely recurse - hot. --- stem/version.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/stem/version.py b/stem/version.py index 613c4a5..68faa36 100644 --- a/stem/version.py +++ b/stem/version.py @@ -187,7 +187,6 @@ class Version(object): return self.version_str - @lru_cache() def _compare(self, other, method): """ Compares version ordering according to the spec. @@ -248,7 +247,6 @@ class Version(object): return self._compare(other, lambda s, o: s >= o) - @lru_cache() def __hash__(self): my_hash = 0

1 0

[tor/master] Free the smartlist after parsing csv config option
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit 528e3bf8921372db9a97a9c624288e44f756188a Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Oct 9 22:49:46 2013 +0000 Free the smartlist after parsing csv config option Bugfix on 1293835440dd4debf6fbfc66e755d9b9384aa362, which implemented 6752: Not in any released tor. --- src/or/confparse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/confparse.c b/src/or/confparse.c index f2ada4f..c5400a6 100644 --- a/src/or/confparse.c +++ b/src/or/confparse.c @@ -392,7 +392,7 @@ config_assign_value(const config_format_t *fmt, void *options, "Interval in '%s %s' is malformed or out of bounds.", c->key, c->value); SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp)); - smartlist_clear(csv_str); + smartlist_free(csv_str); return -1; } csv_int = tor_malloc_zero(sizeof(int)); @@ -401,7 +401,7 @@ config_assign_value(const config_format_t *fmt, void *options, } SMARTLIST_FOREACH_END(str); SMARTLIST_FOREACH(csv_str, char *, cp, tor_free(cp)); - smartlist_clear(csv_str); + smartlist_free(csv_str); break; case CONFIG_TYPE_LINELIST:

1 0

[tor/master] Merge remote-tracking branch 'sysrqb/bug9950'
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit 43f95e38abefced37ad24966d56298e972cebf81 Merge: df4693f 528e3bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 11:27:28 2013 -0400 Merge remote-tracking branch 'sysrqb/bug9950' src/or/confparse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] When freeing a cert_list_t, avoid memory leak.
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit 7dbf66713f22b5e04a36d300307a4df7e375e76b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 19 12:22:49 2013 -0400 When freeing a cert_list_t, avoid memory leak. We were freeing these on exit, but when we added the dl_status_map field to them in fddb814f, we forgot to arrange for it to be freed. I've moved the cert_list_free() code into its own function, and added an appropriate dsmap_free() call. Fixes bug 9644; bugfix on 0.2.4.13-alpha. --- changes/bug9644 | 4 ++++ src/or/routerlist.c | 29 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/changes/bug9644 b/changes/bug9644 new file mode 100644 index 0000000..51c58a5 --- /dev/null +++ b/changes/bug9644 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix a small memory leak on exit. (We weren't freeing directory + authority certificate download statuses.) Fixes bug 9644; bugfix + on 0.2.4.13-alpha. diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c2220f4..c28de24 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -241,6 +241,27 @@ get_cert_list(const char *id_digest) return cl; } +/** Release all space held by a cert_list_t */ +static void +cert_list_free(cert_list_t *cl) +{ + if (!cl) + return; + + SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert, + authority_cert_free(cert)); + smartlist_free(cl->certs); + dsmap_free(cl->dl_status_map, tor_free_); + tor_free(cl); +} + +/** Wrapper for cert_list_free so we can pass it to digestmap_free */ +static void +cert_list_free_(void *cl) +{ + cert_list_free(cl); +} + /** Reload the cached v3 key certificates from the cached-certs file in * the data directory. Return 0 on success, -1 on failure. */ int @@ -3324,13 +3345,7 @@ routerlist_free_all(void) smartlist_free(fallback_dir_servers); trusted_dir_servers = fallback_dir_servers = NULL; if (trusted_dir_certs) { - DIGESTMAP_FOREACH(trusted_dir_certs, key, cert_list_t *, cl) { - SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert, - authority_cert_free(cert)); - smartlist_free(cl->certs); - tor_free(cl); - } DIGESTMAP_FOREACH_END; - digestmap_free(trusted_dir_certs, NULL); + digestmap_free(trusted_dir_certs, cert_list_free_); trusted_dir_certs = NULL; } }

1 0

[tor/master] Merge branch 'bug9644_024' into maint-0.2.4
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit 2c7ed0406f04caa1609014f66c08964c8b38d0b9 Merge: 7b1b8c3 7dbf667 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 11:23:46 2013 -0400 Merge branch 'bug9644_024' into maint-0.2.4 changes/bug9644 | 4 ++++ src/or/routerlist.c | 29 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 10 Oct '13

10 Oct '13

commit df4693fed57d0a0026186beaa6bb819b854c5b10 Merge: 3d817fa 2c7ed04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 10 11:24:16 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9644 | 4 ++++ src/or/routerlist.c | 29 ++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.4] When freeing a cert_list_t, avoid memory leak.
by nickm＠torproject.org 10 Oct '13

10 Oct '13

1 0

[tor/maint-0.2.4] Merge branch 'bug9644_024' into maint-0.2.4
by nickm＠torproject.org 10 Oct '13

10 Oct '13

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013