]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
6 years agoAdd a function to make sure all values in a config object are ok
Nick Mathewson [Wed, 19 Jun 2019 20:06:15 +0000 (16:06 -0400)] 
Add a function to make sure all values in a config object are ok

6 years agoUse structvar to find the types for config vars.
Nick Mathewson [Wed, 19 Jun 2019 14:46:07 +0000 (10:46 -0400)] 
Use structvar to find the types for config vars.

6 years agoUse struct_var_{copy,eq} in confparse.c.
Nick Mathewson [Wed, 19 Jun 2019 12:41:52 +0000 (08:41 -0400)] 
Use struct_var_{copy,eq} in confparse.c.

6 years agoUse struct_magic_decl to verify magic numbers in config objects
Nick Mathewson [Wed, 19 Jun 2019 12:34:20 +0000 (08:34 -0400)] 
Use struct_magic_decl to verify magic numbers in config objects

6 years agoPort confparse to use struct_var in place of typed_var.
Nick Mathewson [Wed, 19 Jun 2019 00:40:59 +0000 (20:40 -0400)] 
Port confparse to use struct_var in place of typed_var.

This requires changes to config_var_t, causing corresponding changes
throughout its users.

6 years agoAdd new "struct_var_" functions to manipulate struct fields.
Nick Mathewson [Wed, 19 Jun 2019 00:40:11 +0000 (20:40 -0400)] 
Add new "struct_var_" functions to manipulate struct fields.

These functions exist one level higher than typed_var_t.  They
describe a type, a name, and an offset within a structure.

6 years agoPartially port routerset to being a full-fledged config type again.
Nick Mathewson [Tue, 18 Jun 2019 23:16:57 +0000 (19:16 -0400)] 
Partially port routerset to being a full-fledged config type again.

6 years agoAdd unit tests for the unitparse.c module.
Nick Mathewson [Wed, 19 Jun 2019 12:15:13 +0000 (08:15 -0400)] 
Add unit tests for the unitparse.c module.

6 years agoFurther clarify our clarification about the type of POSINT
Nick Mathewson [Wed, 19 Jun 2019 12:14:59 +0000 (08:14 -0400)] 
Further clarify our clarification about the type of POSINT

6 years agoAdd a "typed_var" abstraction to implement lvalue access in C.
Nick Mathewson [Fri, 14 Jun 2019 12:42:24 +0000 (08:42 -0400)] 
Add a "typed_var" abstraction to implement lvalue access in C.

Right now, this has been done at a high level by confparse.c, but it
makes more sense to lower it.

This API is radically un-typesafe as it stands; we'll be wrapping it
in a safer API as we do #30914 and lower the struct manipulation
code as well.

Closes ticket 30864.

6 years agoAdd a function to append an existing line to a config line list.
Nick Mathewson [Thu, 13 Jun 2019 19:19:26 +0000 (15:19 -0400)] 
Add a function to append an existing line to a config line list.

We had an existing function to do this, but it took a pair of
strings rather than a line.

6 years agoMove unit-parsing code to src/lib/confmgt
Nick Mathewson [Thu, 13 Jun 2019 15:59:17 +0000 (11:59 -0400)] 
Move unit-parsing code to src/lib/confmgt

lib/confmgt is at a higher level than lib/conf, since it needs to
call down to logging and similar modules.

6 years agoStart moving types that will be used for config vars to lib/conf
Nick Mathewson [Wed, 12 Jun 2019 14:18:30 +0000 (10:18 -0400)] 
Start moving types that will be used for config vars to lib/conf

This will be a lower-level module than anything that actually
sets or handles configuration variables.

Part of 30864.

6 years agocheckSpace.pl: Allow 'bool' before a space and an open-paren
Nick Mathewson [Wed, 12 Jun 2019 20:37:21 +0000 (16:37 -0400)] 
checkSpace.pl:  Allow 'bool' before a space and an open-paren

We need this so we can declare function pointers returning bool
without upsetting our style checker. :/

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Mon, 24 Jun 2019 17:36:42 +0000 (13:36 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge remote-tracking branch 'tor-github/pr/1131'
Nick Mathewson [Mon, 24 Jun 2019 17:36:36 +0000 (13:36 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1131'

6 years agoMerge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1
Nick Mathewson [Mon, 24 Jun 2019 17:36:10 +0000 (13:36 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Mon, 24 Jun 2019 13:32:54 +0000 (09:32 -0400)] 
Merge branch 'maint-0.4.1'

"ours" to avoid version bump.

6 years agobump to 0.4.1.3-alpha
Nick Mathewson [Mon, 24 Jun 2019 13:32:46 +0000 (09:32 -0400)] 
bump to 0.4.1.3-alpha

6 years agostats: Split extrainfo_dump_to_string() into smaller functions.
teor [Mon, 24 Jun 2019 10:32:38 +0000 (20:32 +1000)] 
stats: Split extrainfo_dump_to_string() into smaller functions.

Closes ticket 30956.

6 years agoMerge branch 'bug30956_041' into bug30956_master
teor [Mon, 24 Jun 2019 09:47:34 +0000 (19:47 +1000)] 
Merge branch 'bug30956_041' into bug30956_master

6 years agostats: Always publish pluggable transports in extra info documents
teor [Mon, 24 Jun 2019 09:44:24 +0000 (19:44 +1000)] 
stats: Always publish pluggable transports in extra info documents

Always publish bridge pluggable transport information in the extra info
descriptor, even if ExtraInfoStatistics is 0. This information is
needed by BridgeDB.

Fixes bug 30956; bugfix on 0.4.1.1-alpha.

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Wed, 19 Jun 2019 18:29:22 +0000 (14:29 -0400)] 
Merge branch 'maint-0.4.1'

"ours" merge to avoid taking pracktracker removal.

6 years agoremove practracker from check-local (0.4.1 only)
Nick Mathewson [Wed, 19 Jun 2019 18:29:08 +0000 (14:29 -0400)] 
remove practracker from check-local (0.4.1 only)

6 years agochanges: Fix typo in changes/ticket30893
David Goulet [Wed, 19 Jun 2019 11:50:02 +0000 (07:50 -0400)] 
changes: Fix typo in changes/ticket30893

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge branch 'tor-github/pr/1113'
David Goulet [Wed, 19 Jun 2019 11:47:03 +0000 (07:47 -0400)] 
Merge branch 'tor-github/pr/1113'

6 years agoMerge remote-tracking branch 'tor-github/pr/1115'
Nick Mathewson [Tue, 18 Jun 2019 13:10:34 +0000 (09:10 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1115'

6 years agoMerge branch 'ticket29533_squashed'
Nick Mathewson [Mon, 17 Jun 2019 12:56:13 +0000 (08:56 -0400)] 
Merge branch 'ticket29533_squashed'

6 years agoAdd changes file
rl1987 [Sun, 9 Jun 2019 15:23:05 +0000 (18:23 +0300)] 
Add changes file

6 years agoFix SC2034 in pre-push.git-hook
rl1987 [Sun, 9 Jun 2019 15:21:14 +0000 (18:21 +0300)] 
Fix SC2034 in pre-push.git-hook

6 years agoShellcheck all the scripts
rl1987 [Sun, 9 Jun 2019 15:20:36 +0000 (18:20 +0300)] 
Shellcheck all the scripts

6 years agoMerge remote-tracking branch 'tor-github/pr/1100'
Nick Mathewson [Mon, 17 Jun 2019 12:54:12 +0000 (08:54 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1100'

6 years agoAllow excluding documentation from the build
rl1987 [Sun, 16 Jun 2019 17:18:30 +0000 (20:18 +0300)] 
Allow excluding documentation from the build

6 years agoMerge branch 'bug30894_035' into ticket30893
Nick Mathewson [Sat, 15 Jun 2019 20:50:02 +0000 (16:50 -0400)] 
Merge branch 'bug30894_035' into ticket30893

6 years agoChanges file for ticket 30893 (confparse testing)
Nick Mathewson [Sat, 15 Jun 2019 20:19:25 +0000 (16:19 -0400)] 
Changes file for ticket 30893 (confparse testing)

6 years agoAdd more unit tests for confparse.c, so we can refactor.
Nick Mathewson [Sat, 15 Jun 2019 15:24:43 +0000 (11:24 -0400)] 
Add more unit tests for confparse.c, so we can refactor.

This set of tests gets the line coverage to 100%.

6 years agoFix memleak when failing to parse a CSV_INTERVAL.
Nick Mathewson [Sat, 15 Jun 2019 20:47:16 +0000 (16:47 -0400)] 
Fix memleak when failing to parse a CSV_INTERVAL.

Fixes bug 30894; bugfix on 0.3.4.1-alpha

6 years agoRemove the PORT configuration type: nothing uses it.
Nick Mathewson [Wed, 12 Jun 2019 20:33:40 +0000 (16:33 -0400)] 
Remove the PORT configuration type: nothing uses it.

All of our port configurations now use an extended format.

6 years agoRenaming: CONFIG_TYPE_UINT -> CONFIG_TYPE_POSINT
Nick Mathewson [Wed, 12 Jun 2019 17:49:47 +0000 (13:49 -0400)] 
Renaming: CONFIG_TYPE_UINT -> CONFIG_TYPE_POSINT

This name has been a historical source of confusion, since "uint"
usually suggests "unsigned int" to people, when the real type is
"nonnegative int".

6 years agoMerge branch 'bug30806'
George Kadianakis [Fri, 14 Jun 2019 10:28:32 +0000 (13:28 +0300)] 
Merge branch 'bug30806'

6 years agoMake evloop into a subsystem.
Nick Mathewson [Sat, 8 Jun 2019 00:03:26 +0000 (20:03 -0400)] 
Make evloop into a subsystem.

Note that the event base object is _not_ created from the initialize
function, since it is configuration-dependent.  This will wait until
configuration is integrated into subsystems.

Closes ticket 30806.

6 years agopractracker: accept an extra line in nt_service_install()
teor [Thu, 13 Jun 2019 08:23:50 +0000 (18:23 +1000)] 
practracker: accept an extra line in nt_service_install()

Part of 30799.

6 years agoMerge branch 'tor-github/pr/1099'
George Kadianakis [Wed, 12 Jun 2019 10:02:49 +0000 (13:02 +0300)] 
Merge branch 'tor-github/pr/1099'

6 years agoMerge branch 'tor-github/pr/1088'
George Kadianakis [Wed, 12 Jun 2019 10:01:53 +0000 (13:01 +0300)] 
Merge branch 'tor-github/pr/1088'

6 years agoMerge branch 'tor-github/pr/1102'
George Kadianakis [Wed, 12 Jun 2019 10:00:20 +0000 (13:00 +0300)] 
Merge branch 'tor-github/pr/1102'

6 years agoMerge branch 'tor-github/pr/1040'
David Goulet [Tue, 11 Jun 2019 15:59:39 +0000 (11:59 -0400)] 
Merge branch 'tor-github/pr/1040'

6 years agoAdd changes file for 29976
Taylor Yu [Wed, 22 May 2019 21:33:04 +0000 (16:33 -0500)] 
Add changes file for 29976

6 years agoRework origin circuit tracking to use pubsub
Taylor Yu [Thu, 28 Mar 2019 22:45:49 +0000 (17:45 -0500)] 
Rework origin circuit tracking to use pubsub

Part of ticket 29976.

6 years agoRework orconn tracking to use pubsub
Taylor Yu [Fri, 8 Mar 2019 15:41:43 +0000 (09:41 -0600)] 
Rework orconn tracking to use pubsub

Part of ticket 29976.

6 years agoMerge branch 'tor-github/pr/1031'
David Goulet [Tue, 11 Jun 2019 15:46:38 +0000 (11:46 -0400)] 
Merge branch 'tor-github/pr/1031'

6 years agoMerge branch 'tor-github/pr/1083'
David Goulet [Tue, 11 Jun 2019 15:43:15 +0000 (11:43 -0400)] 
Merge branch 'tor-github/pr/1083'

6 years agoMerge branch 'maint-0.4.1'
David Goulet [Tue, 11 Jun 2019 15:30:05 +0000 (11:30 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'tor-github/pr/1050' into maint-0.4.1
David Goulet [Tue, 11 Jun 2019 15:29:46 +0000 (11:29 -0400)] 
Merge branch 'tor-github/pr/1050' into maint-0.4.1

6 years agoAdd a changes file for ticket 30686.
Nick Mathewson [Wed, 29 May 2019 13:23:13 +0000 (09:23 -0400)] 
Add a changes file for ticket 30686.

6 years agoGive a compile warning when we don't have any flags for minherit().
Nick Mathewson [Wed, 29 May 2019 13:22:18 +0000 (09:22 -0400)] 
Give a compile warning when we don't have any flags for minherit().

Part of ticket 30686.

6 years agoGive a more useful failure messgae when we fail to minherit().
Nick Mathewson [Wed, 29 May 2019 13:21:45 +0000 (09:21 -0400)] 
Give a more useful failure messgae when we fail to minherit().

Part of ticket 30686.

6 years agoMerge branch 'ticket28453_v2' into ticket28453_v2_merged
Nick Mathewson [Tue, 11 Jun 2019 14:22:37 +0000 (10:22 -0400)] 
Merge branch 'ticket28453_v2' into ticket28453_v2_merged

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Tue, 11 Jun 2019 14:17:18 +0000 (10:17 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
Nick Mathewson [Tue, 11 Jun 2019 14:17:18 +0000 (10:17 -0400)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Tue, 11 Jun 2019 14:17:18 +0000 (10:17 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.5
Nick Mathewson [Tue, 11 Jun 2019 14:17:17 +0000 (10:17 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.5

6 years agoUpdate geoip and geoip6 to the June 10 2019 database.
Karsten Loesing [Tue, 11 Jun 2019 14:12:50 +0000 (16:12 +0200)] 
Update geoip and geoip6 to the June 10 2019 database.

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Tue, 11 Jun 2019 12:41:55 +0000 (08:41 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1
Nick Mathewson [Tue, 11 Jun 2019 12:41:48 +0000 (08:41 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1

6 years agoMerge branch 'tor-github/pr/1060'
George Kadianakis [Tue, 11 Jun 2019 11:12:22 +0000 (14:12 +0300)] 
Merge branch 'tor-github/pr/1060'

6 years agoMerge branch 'ticket30769_041_01'
George Kadianakis [Tue, 11 Jun 2019 11:11:24 +0000 (14:11 +0300)] 
Merge branch 'ticket30769_041_01'

6 years agotrunnel: Rename sendme.trunnel to sendme_cell.trunnel
David Goulet [Wed, 5 Jun 2019 13:57:52 +0000 (09:57 -0400)] 
trunnel: Rename sendme.trunnel to sendme_cell.trunnel

This is to avoid having two sendme.{c|h} in the repository since the subsystem
is implemented in src/core/or/sendme.{c|h}.

Fixes #30769

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge branch 'ticket30687_042_01'
George Kadianakis [Tue, 11 Jun 2019 11:02:33 +0000 (14:02 +0300)] 
Merge branch 'ticket30687_042_01'

6 years agotoken-bucket: Implement a single counter object
David Goulet [Wed, 29 May 2019 15:34:07 +0000 (11:34 -0400)] 
token-bucket: Implement a single counter object

Closes #30687.

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge branch 'maint-0.4.1'
George Kadianakis [Tue, 11 Jun 2019 10:48:16 +0000 (13:48 +0300)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'tor-github/pr/1065' into maint-0.4.1
George Kadianakis [Tue, 11 Jun 2019 10:48:10 +0000 (13:48 +0300)] 
Merge branch 'tor-github/pr/1065' into maint-0.4.1

6 years agoMerge branch 'tor-github/pr/1098'
George Kadianakis [Tue, 11 Jun 2019 10:19:43 +0000 (13:19 +0300)] 
Merge branch 'tor-github/pr/1098'

6 years agochanges: file for 30799
teor [Tue, 11 Jun 2019 05:15:19 +0000 (15:15 +1000)] 
changes: file for 30799

Note that this memory leak is in unreachable code.

6 years agoFree a string buffer in nt_service_install()
Xiaoyin Liu [Fri, 7 Jun 2019 09:13:49 +0000 (17:13 +0800)] 
Free a string buffer in nt_service_install()

The string buffer "command" is not freed if the specified account
name doesn't exist. This patch fixes this bug.

6 years agoMerge branch 'maint-0.4.1'
teor [Tue, 11 Jun 2019 04:52:40 +0000 (14:52 +1000)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
teor [Tue, 11 Jun 2019 04:52:36 +0000 (14:52 +1000)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Tue, 11 Jun 2019 04:52:27 +0000 (14:52 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
teor [Tue, 11 Jun 2019 04:51:46 +0000 (14:51 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
teor [Tue, 11 Jun 2019 04:51:37 +0000 (14:51 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
teor [Tue, 11 Jun 2019 04:48:52 +0000 (14:48 +1000)] 
Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5
teor [Tue, 11 Jun 2019 04:47:40 +0000 (14:47 +1000)] 
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
teor [Tue, 11 Jun 2019 04:46:24 +0000 (14:46 +1000)] 
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5

6 years agoStop hard-coding env vars in the git scripts
teor [Tue, 11 Jun 2019 04:34:44 +0000 (14:34 +1000)] 
Stop hard-coding env vars in the git scripts

Set the env vars:
* TOR_MASTER_NAME to override the tor master branch name, and
* TOR_WKT_NAME to override the worktree path

Fixes bug 30841; bugfix on 0.4.0.1-alpha.

6 years agoscripts/git: Stop hard-coding the bash path in the git scripts
teor [Tue, 11 Jun 2019 04:29:10 +0000 (14:29 +1000)] 
scripts/git: Stop hard-coding the bash path in the git scripts

Some OSes don't have bash in /usr/bin, others have an ancient bash at
this path.

Fixes bug 30840; bugfix on 0.4.0.1-alpha.

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Mon, 10 Jun 2019 22:44:31 +0000 (18:44 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
Nick Mathewson [Mon, 10 Jun 2019 22:44:31 +0000 (18:44 -0400)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

6 years agoMerge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
Nick Mathewson [Mon, 10 Jun 2019 22:44:20 +0000 (18:44 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Mon, 10 Jun 2019 22:33:26 +0000 (18:33 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
Nick Mathewson [Mon, 10 Jun 2019 22:33:26 +0000 (18:33 -0400)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Mon, 10 Jun 2019 22:31:36 +0000 (18:31 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1
Nick Mathewson [Mon, 10 Jun 2019 22:31:23 +0000 (18:31 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1

6 years agoMerge remote-tracking branch 'tor-github/pr/1038'
Nick Mathewson [Mon, 10 Jun 2019 13:38:40 +0000 (09:38 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1038'

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Mon, 10 Jun 2019 13:37:28 +0000 (09:37 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
Nick Mathewson [Mon, 10 Jun 2019 13:37:17 +0000 (09:37 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1

6 years agoAdd an environment variable to set GIT_PATH in git scripts
Nick Mathewson [Mon, 10 Jun 2019 13:05:26 +0000 (09:05 -0400)] 
Add an environment variable to set GIT_PATH in git scripts

6 years agopush-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH
Nick Mathewson [Mon, 10 Jun 2019 12:56:26 +0000 (08:56 -0400)] 
push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH

We already allow this override in our pre-push hook, so let's allow
it here too.

(I call my upstream branches "origin")

6 years agoUpdate git scripts for new versions
Nick Mathewson [Mon, 10 Jun 2019 12:54:22 +0000 (08:54 -0400)] 
Update git scripts for new versions

{maint,release}-0.4.1 are now real

{maint,release}-0.3.4 are now EOL

Closes ticket 30822

6 years agoBump master to 0.4.2.0-alpha-dev
Nick Mathewson [Mon, 10 Jun 2019 12:47:33 +0000 (08:47 -0400)] 
Bump master to 0.4.2.0-alpha-dev

6 years agotest: fix a typo in test_rebind.sh
teor [Mon, 10 Jun 2019 10:56:40 +0000 (20:56 +1000)] 
test: fix a typo in test_rebind.sh

Closes 30821.

6 years agoMerge branch 'bug30713_035' into bug30713_040
teor [Mon, 10 Jun 2019 10:50:53 +0000 (20:50 +1000)] 
Merge branch 'bug30713_035' into bug30713_040