- tor-commits - lists.torproject.org

[torbutton/master] Bug 3446: We're Firefox 5.0, we swear.
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit b834e541cf975eeaa291a374b4b95222b36eebd6 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 15:39:17 2011 -0700 Bug 3446: We're Firefox 5.0, we swear. --- src/defaults/preferences/preferences.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 10538e0..353ee32 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -205,7 +205,7 @@ pref("extensions.torbutton.appversion_override","5.0 (Windows)"); pref("extensions.torbutton.platform_override","Win32"); pref("extensions.torbutton.oscpu_override", "Windows NT 6.1"); -pref("extensions.torbutton.useragent_override", "Mozilla/5.0 (Windows NT 6.1; rv:2.0) Gecko/20100101 Firefox/4.0"); +pref("extensions.torbutton.useragent_override", "Mozilla/5.0 (Windows NT 6.1; rv:5.0) Gecko/20100101 Firefox/5.0"); pref("extensions.torbutton.productsub_override","20100101"); pref("extensions.torbutton.buildID_override","0");

1 0

[torbutton/master] Make DuckDuckGo the default Google Captcha redirect destination.
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit 63e6eeeea1ed61fc0e14f7abd0d8bde9778a5733 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 15:40:00 2011 -0700 Make DuckDuckGo the default Google Captcha redirect destination. The search results seem slightly better than ixquick, and the interface is a lot slicker. Plus, who wouldn't trust a duck with a bow-tie? He just wants to help you so bad. --- src/chrome/content/preferences.xul | 4 ++-- src/defaults/preferences/preferences.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index b4eb3d0..1795fc1 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -359,10 +359,10 @@ oncommand="torbutton_prefs_set_field_attributes(document)"/> <hbox class="indent" align="center"> <radiogroup align="center" orient="horizontal" id="torbutton_searchEngine"> - <radio id="torbutton_engine1" label="&torbutton.prefs.engine1;" - oncommand="torbutton_prefs_set_field_attributes(document)"/> <radio id="torbutton_engine5" label="&torbutton.prefs.engine5;" oncommand="torbutton_prefs_set_field_attributes(document)"/> + <radio id="torbutton_engine1" label="&torbutton.prefs.engine1;" + oncommand="torbutton_prefs_set_field_attributes(document)"/> <radio id="torbutton_engine2" label="&torbutton.prefs.engine2;" oncommand="torbutton_prefs_set_field_attributes(document)"/> <radio id="torbutton_engine3" label="&torbutton.prefs.engine3;" diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 353ee32..6c874b6 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -189,7 +189,7 @@ pref("extensions.torbutton.regen_google_cookies", false); pref("extensions.torbutton.xfer_google_cookies", true); // Google redirect prefs -pref("extensions.torbutton.google_redir_url", 1); +pref("extensions.torbutton.google_redir_url", 5); pref("extensions.torbutton.dodge_google_captcha", true); pref("extensions.torbutton.asked_google_captcha", false); pref("extensions.torbutton.redir_url.1", "https://www.ixquick.com/do/metasearch.pl?query=");

1 0

[torbutton/master] Fix a transparent context menu issue on Linux FF4+.
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit 505f51d2158720509428c1b24686723c49beb0f7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 16:12:59 2011 -0700 Fix a transparent context menu issue on Linux FF4+. --- src/chrome/content/popup.xul | 4 ++-- src/chrome/content/torbutton.xul | 2 +- src/chrome/content/torbutton_tb.xul | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 03f55f8..f96b821 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -9,7 +9,7 @@ <stringbundleset id="torbutton-stringbundleset"> <stringbundle id="torbutton-bundle" src="chrome://torbutton/locale/torbutton.properties"/> </stringbundleset> - <popup id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();"> + <menupopup id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();"> <menuitem id="torbutton-toggle" label="&torbutton.context_menu.toggle;" accesskey="&torbutton.context_menu.toggle.key;" @@ -31,6 +31,6 @@ accesskey="&torbutton.context_menu.about.key;" insertafter="context-stop" oncommand="torbutton_open_about_dialog()"/> - </popup> + </menupopup> </overlay> diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index 428d4da..f600f89 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -20,7 +20,7 @@  <toolbar id="nav-bar"> - <popup id="torbutton-context-menu"/> + <menupopup id="torbutton-context-menu"/> </toolbar> <toolbarpalette id="BrowserToolbarPalette"> diff --git a/src/chrome/content/torbutton_tb.xul b/src/chrome/content/torbutton_tb.xul index 41f2d58..5142b2e 100644 --- a/src/chrome/content/torbutton_tb.xul +++ b/src/chrome/content/torbutton_tb.xul @@ -52,6 +52,6 @@ context="torbutton-context-menu" onclick="if (event.button == 0) torbutton_toggle(false)"/> - <popup id="torbutton-context-menu"/> + <menupopup id="torbutton-context-menu"/> </statusbar> </overlay>

1 0

[tor/master] explain that the ./publish should happen soon after the scp
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit b181985a8f98c0ba15230912f059e1fcf7c626f1 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 21 00:37:18 2011 -0400 explain that the ./publish should happen soon after the scp otherwise you scp a tarball up but only one version of the website has it. --- doc/HACKING | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 7ff9c5f..feeb05d 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -456,7 +456,6 @@ interesting and understandable. 2.7) Run it through fmt to make it pretty. - 3) Compose a short release blurb to highlight the user-facing changes. Insert said release blurb into the ChangeLog stanza. If it's a stable release, add it to the ReleaseNotes file too. If we're adding @@ -472,15 +471,19 @@ or somebody to try building it on Windows. 6) Get at least two of weasel/arma/karsten to put the new version number in their approved versions list. -7) Sign and push the tarball to the website in the dist/ directory. Sign -and push the git tag. - (That's either "git tag -u <keyid> tor-0.2.x.y-status", then - "git push origin tag tor-0.2.x.y-status". To sign the - tarball, "gpg -ba <the_tarball>". Put the files in - /srv/www-master.torproject.org/htdocs/dist/ on vescum.) +7) Sign the tarball, then sign and push the git tag: + gpg -ba <the_tarball> + git tag -u <keyid> tor-0.2.x.y-status + git push origin tag tor-0.2.x.y-status + +8) scp the tarball and its sig to the website in the dist/ directory +(i.e. /srv/www-master.torproject.org/htdocs/dist/ on vescum). Edit +include/versions.wmi to note the new version. From your website checkout, +run ./publish to build and publish the website. -8) Edit include/versions.wmi to note the new version. From your website -checkout, run ./publish to build and publish the website. +Try not to delay too much between scp'ing the tarball and running +./publish -- the website has multiple A records and your scp only sent +it to one of them. 9) Email Erinn and weasel (cc'ing tor-assistants) that a new tarball is up. This step should probably change to mailing more packagers. @@ -498,3 +501,4 @@ changelog to tor-talk or tor-announce. (We might be moving to faster announcements, but don't announce until the website is at least updated.) +

1 0

[tor/master] Fix minor comment issues
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit d7254bea11a0fc2685cc2ea24fb57d2ab3945b2f Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Jun 19 01:28:40 2011 -0700 Fix minor comment issues --- src/common/compat.c | 2 +- src/or/connection.c | 6 +++--- src/or/or.h | 6 +++--- src/test/Makefile.am | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 9377959..c983925 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -415,7 +415,7 @@ tor_vasprintf(char **strp, const char *fmt, va_list args) * * This function is not timing-safe. * - * Requires that nlen be greater than zero. + * Requires that nlen be greater than zero. */ const void * tor_memmem(const void *_haystack, size_t hlen, diff --git a/src/or/connection.c b/src/or/connection.c index a9e3a74..b2412a2 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2751,15 +2751,15 @@ connection_outbuf_too_full(connection_t *conn) return (conn->outbuf_flushlen > 10*CELL_PAYLOAD_SIZE); } -/** Try to flush more bytes onto conn-\>s. +/** Try to flush more bytes onto conn-\>s. * * This function gets called either from conn_write() in main.c * when poll() has declared that conn wants to write, or below * from connection_write_to_buf() when an entire TLS record is ready. * - * Update conn-\>timestamp_lastwritten to now, and call flush_buf + * Update conn-\>timestamp_lastwritten to now, and call flush_buf * or flush_buf_tls appropriately. If it succeeds and there are no more - * more bytes on conn->outbuf, then call connection_finished_flushing + * more bytes on conn-\>outbuf, then call connection_finished_flushing * on it too. * * If force, then write as many bytes as possible, ignoring bandwidth diff --git a/src/or/or.h b/src/or/or.h index 97fecd1..1909887 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2318,14 +2318,14 @@ typedef struct or_circuit_t { cell_ewma_t p_cell_ewma; } or_circuit_t; -/** Convert a circuit subtype to a circuit_t.*/ +/** Convert a circuit subtype to a circuit_t. */ #define TO_CIRCUIT(x) (&((x)->_base)) -/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Asserts +/** Convert a circuit_t* to a pointer to the enclosing or_circuit_t. Assert * if the cast is impossible. */ static or_circuit_t *TO_OR_CIRCUIT(circuit_t *); /** Convert a circuit_t* to a pointer to the enclosing origin_circuit_t. - * Asserts if the cast is impossible. */ + * Assert if the cast is impossible. */ static origin_circuit_t *TO_ORIGIN_CIRCUIT(circuit_t *); static INLINE or_circuit_t *TO_OR_CIRCUIT(circuit_t *x) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index 546fa2f..904719d 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \ -I"$(top_srcdir)/src/or" # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. -# This seems to matter nowhere but on windows, but I assure you that it +# This seems to matter nowhere but on Windows, but I assure you that it # matters a lot there, and is quite hard to debug if you forget to do it. test_SOURCES = \

1 0

[tor/master] Fix comment typo
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 8a55da57ed17dfb9cefe3193cbda53a15547630e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Sun Jun 19 01:25:51 2011 -0700 Fix comment typo --- src/test/tinytest_demo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/test/tinytest_demo.c b/src/test/tinytest_demo.c index bd33cc3..4d2f588 100644 --- a/src/test/tinytest_demo.c +++ b/src/test/tinytest_demo.c @@ -39,7 +39,7 @@ /* ============================================================ */ /* First, let's see if strcmp is working. (All your test cases should be - * functions declared to take a single void * as) an argument. */ + * functions declared to take a single void * as an argument.) */ void test_strcmp(void *data) {

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 9919b0127568253b6bec4f681db3cdc2b5978991 Merge: 64a5a41 2b5ebc7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 22 18:15:27 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/HACKING | 22 +++++++++++++--------- src/common/compat.c | 2 +- src/common/container.c | 5 +++-- src/or/connection.c | 6 +++--- src/or/or.h | 6 +++--- src/test/Makefile.am | 2 +- src/test/tinytest_demo.c | 2 +- 7 files changed, 25 insertions(+), 20 deletions(-)

1 0

[tor/master] Improve documentation of smartlist_split_string
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 2b5ebc70973b1c0dd62201908632733c0953a4ec Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Jun 22 13:47:32 2011 -0700 Improve documentation of smartlist_split_string --- src/common/container.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/container.c b/src/common/container.c index da44b7f..1515c38 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -338,7 +338,8 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) /** * Split a string str along all occurrences of sep, - * adding the split strings, in order, to sl. + * appending the (newly allocated) split strings, in order, to + * sl. Return the number of strings added to sl. * * If flags&SPLIT_SKIP_SPACE is true, remove initial and * trailing space from each entry. @@ -347,7 +348,7 @@ smartlist_insert(smartlist_t *sl, int idx, void *val) * If flags&SPLIT_STRIP_SPACE is true, strip spaces from each * split string. * - * If max>0, divide the string into no more than max pieces. If + * If max\>0, divide the string into no more than max pieces. If * sep is NULL, split on any sequence of horizontal space. */ int

1 0

[tor/master] Correct terminology in comment
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 76d0d62bd9ad91c54817f2599305575d9a551f08 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jun 24 11:28:52 2011 -0700 Correct terminology in comment --- src/or/or.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 31f9e5b..d44e863 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2197,8 +2197,8 @@ typedef struct { unsigned int need_capacity : 1; /** Whether the last hop was picked with exiting in mind. */ unsigned int is_internal : 1; - /** Did we pick this as a one-hop tunnel (not safe for other conns)? - * These are for encrypted connections that exit to this router, not + /** Did we pick this as a one-hop tunnel (not safe for other streams)? + * These are for encrypted dir conns that exit to this router, not * for arbitrary exits from the circuit. */ unsigned int onehop_tunnel : 1; /** The crypt_path_t to append after rendezvous: used for rendezvous. */

1 0

[tor/master] Store cpath_build_state_t flags in one-bit bitfields, not ints
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 58f801fadf56dcd72c922a6934b166b7651d14d1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jun 24 11:28:15 2011 -0700 Store cpath_build_state_t flags in one-bit bitfields, not ints --- src/or/or.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 7daf195..31f9e5b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2192,15 +2192,15 @@ typedef struct { /** How to extend to the planned exit node. */ extend_info_t *chosen_exit; /** Whether every node in the circ must have adequate uptime. */ - int need_uptime; + unsigned int need_uptime : 1; /** Whether every node in the circ must have adequate capacity. */ - int need_capacity; + unsigned int need_capacity : 1; /** Whether the last hop was picked with exiting in mind. */ - int is_internal; + unsigned int is_internal : 1; /** Did we pick this as a one-hop tunnel (not safe for other conns)? * These are for encrypted connections that exit to this router, not * for arbitrary exits from the circuit. */ - int onehop_tunnel; + unsigned int onehop_tunnel : 1; /** The crypt_path_t to append after rendezvous: used for rendezvous. */ crypt_path_t *pending_final_cpath; /** How many times has building a circuit for this task failed? */

1 0