March 2011 - tor-commits - lists.torproject.org

r24365: {website} make sure arabic translations use the right CSS (website/trunk)
by Runa Sandvik 17 Mar '11

17 Mar '11

Author: runa Date: 2011-03-17 08:53:43 +0000 (Thu, 17 Mar 2011) New Revision: 24365 Modified: website/trunk/po2wml.sh Log: make sure arabic translations use the right CSS Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-03-16 21:33:49 UTC (rev 24364) +++ website/trunk/po2wml.sh 2011-03-17 08:53:43 UTC (rev 24365) @@ -114,6 +114,15 @@ sed -i 's///' "$wmldir/$subdir/$wmlfile" fi + + # If the file is an Arabic translation, make + # sure it is using the right CSS + if [ $subdir = "ar" ] + then + orig_include=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + new_include=`echo $orig_include 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_include@$new_include@" "$wmldir/$subdir/$wmlfile" + fi fi } @@ -134,6 +143,15 @@ # Include foot.wmi echo "#include <foot.wmi>" >> "$wmldir/$subdir/$lang/$wmlfile" + + # If the file is an Arabic translation, make + # sure it is using the right CSS + if [ $lang = "ar" ] + then + orig_include=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + new_include=`echo $orig_include 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_include@$new_include@" "$wmldir/$subdir/$lang/$wmlfile" + fi fi }

1 0

[tor/master] Move the decl for tor_gettimofday_cache_clear to the right header
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 27d1675d93a07227aae3bb1d86bd4876d6c3ac77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 17:54:43 2011 -0400 Move the decl for tor_gettimofday_cache_clear to the right header --- src/or/relay.c | 4 ++-- src/or/relay.h | 2 ++ src/or/routerparse.h | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 2510242..076b46b 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -52,9 +52,9 @@ static int circuit_consider_stop_edge_reading(circuit_t *circ, crypt_path_t *layer_hint); static int circuit_queue_streams_are_blocked(circuit_t *circ); +/* XXXX023 move this all to compat_libevent */ /** Cache the current hi-res time; the cache gets reset when libevent * calls us. */ - static struct timeval cached_time_hires = {0, 0}; /** Stop reading on edge connections when we have this many cells @@ -76,7 +76,7 @@ tor_gettimeofday_cached(struct timeval *tv) void tor_gettimeofday_cache_clear(void) { - cached_time_hires.tv_sec = 0; + cached_time_hires.tv_sec = 0; } /** Stats: how many relay cells have originated at this hop, or have diff --git a/src/or/relay.h b/src/or/relay.h index dbba092..f64752d 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -64,5 +64,7 @@ void cell_ewma_set_scale_factor(or_options_t *options, networkstatus_t *consensus); void circuit_clear_cell_queue(circuit_t *circ, or_connection_t *orconn); +void tor_gettimeofday_cache_clear(void); + #endif diff --git a/src/or/routerparse.h b/src/or/routerparse.h index 3499f18..8b8cde2 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -82,7 +82,5 @@ int rend_parse_introduction_points(rend_service_descriptor_t *parsed, size_t intro_points_encoded_size); int rend_parse_client_keys(strmap_t *parsed_clients, const char *str); -void tor_gettimeofday_cache_clear(void); - #endif

1 0

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

16 Mar '11

commit 1db6eb6cb7db46d8dde482f629fbc1c578310d52 Merge: b1b6552 9dfa244 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 18:10:24 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/compat_libevent.c | 8 ++++---- src/or/config.c | 6 +++--- src/or/relay.c | 4 ++-- src/or/relay.h | 2 ++ src/or/rephist.c | 1 - src/or/routerparse.h | 2 -- 6 files changed, 11 insertions(+), 12 deletions(-) diff --cc src/or/rephist.c index 2b804b1,58e8ff0..688ff82 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@@ -2324,9 -2334,9 +2324,8 @@@ typedef struct circ_buffer_stats_t uint32_t processed_cells; double mean_num_cells_in_queue; double mean_time_cells_in_queue; - uint32_t local_circ_id; } circ_buffer_stats_t; - /** Holds stats. */ smartlist_t *circuits_for_buffer_stats = NULL; /** Remember cell statistics for circuit circ at time

1 0

[tor/master] Resolve the one DOCDOC in the 0.2.2 code atm
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 721954b3a2a55e82160815f4c133e7da66712542 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 18:07:55 2011 -0400 Resolve the one DOCDOC in the 0.2.2 code atm --- src/common/compat_libevent.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 0e5a906..3efc56d 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -228,9 +228,9 @@ tor_libevent_get_method(void) #endif } -/** Return the le_version_t for the current version of libevent. If the - * version is very new, return LE_OTHER. If the version is so old that it - * doesn't support event_get_version(), return LE_OLD. DOCDOC */ +/** Return the le_version_t for the version of libevent specified in the + * string v. If the version is very new or uses an unrecognized + * version, format, return LE_OTHER. */ static le_version_t tor_decode_libevent_version(const char *v) { @@ -280,7 +280,7 @@ le_versions_compatibility(le_version_t v) } /** Return the version number of the currently running version of Libevent. - See le_version_t for info on the format. + * See le_version_t for info on the format. */ static le_version_t tor_get_libevent_version(const char **v_out)

1 0

[tor/master] Document a few more members.
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 9dfa244484ff9c52d545daa620e034b4d03f969c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 18:10:15 2011 -0400 Document a few more members. --- src/or/config.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d4be207..5719a64 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4770,10 +4770,10 @@ options_save_current(void) } /** Mapping from a unit name to a multiplier for converting that unit into a - * base unit. */ + * base unit. Used by config_parse_unit. */ struct unit_table_t { - const char *unit; - uint64_t multiplier; + const char *unit; /**< The name of the unit */ + uint64_t multiplier; /**< How many of the base unit appear in this unit */ }; /** Table to map the names of memory units to the number of bytes they

1 0

[tor/master] Remove a useless doxygen comment
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 8f9cfa0abe3793e120ee25a0f339bcee4d3fa4db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 18:07:42 2011 -0400 Remove a useless doxygen comment --- src/or/rephist.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index e4afe62..58e8ff0 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2337,7 +2337,6 @@ typedef struct circ_buffer_stats_t { uint32_t local_circ_id; } circ_buffer_stats_t; -/** Holds stats. */ smartlist_t *circuits_for_buffer_stats = NULL; /** Remember cell statistics for circuit circ at time

1 0

[tor/maint-0.2.2] Resolve the one DOCDOC in the 0.2.2 code atm
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 721954b3a2a55e82160815f4c133e7da66712542 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 18:07:55 2011 -0400 Resolve the one DOCDOC in the 0.2.2 code atm --- src/common/compat_libevent.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c index 0e5a906..3efc56d 100644 --- a/src/common/compat_libevent.c +++ b/src/common/compat_libevent.c @@ -228,9 +228,9 @@ tor_libevent_get_method(void) #endif } -/** Return the le_version_t for the current version of libevent. If the - * version is very new, return LE_OTHER. If the version is so old that it - * doesn't support event_get_version(), return LE_OLD. DOCDOC */ +/** Return the le_version_t for the version of libevent specified in the + * string v. If the version is very new or uses an unrecognized + * version, format, return LE_OTHER. */ static le_version_t tor_decode_libevent_version(const char *v) { @@ -280,7 +280,7 @@ le_versions_compatibility(le_version_t v) } /** Return the version number of the currently running version of Libevent. - See le_version_t for info on the format. + * See le_version_t for info on the format. */ static le_version_t tor_get_libevent_version(const char **v_out)

1 0

[tor/maint-0.2.2] Document a few more members.
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 9dfa244484ff9c52d545daa620e034b4d03f969c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 18:10:15 2011 -0400 Document a few more members. --- src/or/config.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d4be207..5719a64 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4770,10 +4770,10 @@ options_save_current(void) } /** Mapping from a unit name to a multiplier for converting that unit into a - * base unit. */ + * base unit. Used by config_parse_unit. */ struct unit_table_t { - const char *unit; - uint64_t multiplier; + const char *unit; /**< The name of the unit */ + uint64_t multiplier; /**< How many of the base unit appear in this unit */ }; /** Table to map the names of memory units to the number of bytes they

1 0

[tor/maint-0.2.2] Move the decl for tor_gettimofday_cache_clear to the right header
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 27d1675d93a07227aae3bb1d86bd4876d6c3ac77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 17:54:43 2011 -0400 Move the decl for tor_gettimofday_cache_clear to the right header --- src/or/relay.c | 4 ++-- src/or/relay.h | 2 ++ src/or/routerparse.h | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 2510242..076b46b 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -52,9 +52,9 @@ static int circuit_consider_stop_edge_reading(circuit_t *circ, crypt_path_t *layer_hint); static int circuit_queue_streams_are_blocked(circuit_t *circ); +/* XXXX023 move this all to compat_libevent */ /** Cache the current hi-res time; the cache gets reset when libevent * calls us. */ - static struct timeval cached_time_hires = {0, 0}; /** Stop reading on edge connections when we have this many cells @@ -76,7 +76,7 @@ tor_gettimeofday_cached(struct timeval *tv) void tor_gettimeofday_cache_clear(void) { - cached_time_hires.tv_sec = 0; + cached_time_hires.tv_sec = 0; } /** Stats: how many relay cells have originated at this hop, or have diff --git a/src/or/relay.h b/src/or/relay.h index dbba092..f64752d 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -64,5 +64,7 @@ void cell_ewma_set_scale_factor(or_options_t *options, networkstatus_t *consensus); void circuit_clear_cell_queue(circuit_t *circ, or_connection_t *orconn); +void tor_gettimeofday_cache_clear(void); + #endif diff --git a/src/or/routerparse.h b/src/or/routerparse.h index 3499f18..8b8cde2 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -82,7 +82,5 @@ int rend_parse_introduction_points(rend_service_descriptor_t *parsed, size_t intro_points_encoded_size); int rend_parse_client_keys(strmap_t *parsed_clients, const char *str); -void tor_gettimeofday_cache_clear(void); - #endif

1 0

[tor/maint-0.2.2] Remove a useless doxygen comment
by nickm＠torproject.org 16 Mar '11

16 Mar '11

commit 8f9cfa0abe3793e120ee25a0f339bcee4d3fa4db Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 16 18:07:42 2011 -0400 Remove a useless doxygen comment --- src/or/rephist.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index e4afe62..58e8ff0 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2337,7 +2337,6 @@ typedef struct circ_buffer_stats_t { uint32_t local_circ_id; } circ_buffer_stats_t; -/** Holds stats. */ smartlist_t *circuits_for_buffer_stats = NULL; /** Remember cell statistics for circuit circ at time

1 0