]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
6 years agoMerge remote-tracking branch 'tor-github/pr/864'
teor [Tue, 2 Apr 2019 01:46:42 +0000 (11:46 +1000)] 
Merge remote-tracking branch 'tor-github/pr/864'

6 years agoMerge branch 'maint-0.4.0'
teor [Tue, 2 Apr 2019 01:45:39 +0000 (11:45 +1000)] 
Merge branch 'maint-0.4.0'

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Tue, 2 Apr 2019 01:45:31 +0000 (11:45 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Tue, 2 Apr 2019 01:45:22 +0000 (11:45 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.4
teor [Tue, 2 Apr 2019 01:45:13 +0000 (11:45 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.4

6 years agoallow circuituse.c to get even longer.
Nick Mathewson [Fri, 29 Mar 2019 18:30:33 +0000 (14:30 -0400)] 
allow circuituse.c to get even longer.

6 years agoMerge branch 'ticket29662_squashed' into ticket29662_squashed_merged
Nick Mathewson [Fri, 29 Mar 2019 18:28:48 +0000 (14:28 -0400)] 
Merge branch 'ticket29662_squashed' into ticket29662_squashed_merged

6 years agoCheck for NULL in tor_assertf_nonfatal()
rl1987 [Fri, 29 Mar 2019 16:38:27 +0000 (18:38 +0200)] 
Check for NULL in tor_assertf_nonfatal()

6 years agoRefrain from using static buffer for assert failure message; call tor_asprintf()...
rl1987 [Fri, 22 Mar 2019 11:44:02 +0000 (13:44 +0200)] 
Refrain from using static buffer for assert failure message; call tor_asprintf() instead

6 years agoAdd changes file
rl1987 [Tue, 5 Mar 2019 16:02:24 +0000 (18:02 +0200)] 
Add changes file

6 years agoUse tor_assertf{_nonfatal} in code
rl1987 [Tue, 5 Mar 2019 15:58:31 +0000 (17:58 +0200)] 
Use tor_assertf{_nonfatal} in code

6 years agoSilence compiler warnings
rl1987 [Tue, 5 Mar 2019 15:02:03 +0000 (17:02 +0200)] 
Silence compiler warnings

6 years agotest_routerkeys.c: Always check mkdir() return value
Nick Mathewson [Thu, 28 Mar 2019 13:29:00 +0000 (09:29 -0400)] 
test_routerkeys.c: Always check mkdir() return value

After this fix, we have no more unchecked mkdir() calls.

Bug 29939; CID 144254. Bugfix on 0.2.7.2-alpha.

6 years agoMerge branch 'tor-github/pr/859'
George Kadianakis [Wed, 27 Mar 2019 12:30:53 +0000 (14:30 +0200)] 
Merge branch 'tor-github/pr/859'

6 years agoMerge branch 'maint-0.4.0'
teor [Wed, 27 Mar 2019 02:31:37 +0000 (12:31 +1000)] 
Merge branch 'maint-0.4.0'

6 years agoMerge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0
teor [Wed, 27 Mar 2019 02:31:07 +0000 (12:31 +1000)] 
Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0

6 years agopractracker updates from messaging_v3 merge
Nick Mathewson [Wed, 27 Mar 2019 00:04:09 +0000 (20:04 -0400)] 
practracker updates from messaging_v3 merge

(main.c is a bit better, but shutdown.c is ugly)

6 years agoMerge branch 'messaging_v3' into messaging_v3_merged
Nick Mathewson [Wed, 27 Mar 2019 00:13:49 +0000 (20:13 -0400)] 
Merge branch 'messaging_v3' into messaging_v3_merged

6 years agochanges file for pubsub code
Nick Mathewson [Wed, 27 Mar 2019 00:07:26 +0000 (20:07 -0400)] 
changes file for pubsub code

6 years agoMerge branch 'maint-0.4.0'
teor [Wed, 27 Mar 2019 00:02:55 +0000 (10:02 +1000)] 
Merge branch 'maint-0.4.0'

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Wed, 27 Mar 2019 00:02:47 +0000 (10:02 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Wed, 27 Mar 2019 00:02:40 +0000 (10:02 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
teor [Wed, 27 Mar 2019 00:01:45 +0000 (10:01 +1000)] 
Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4

6 years agoRemove message/subsystem numbers from log messages
Nick Mathewson [Tue, 26 Mar 2019 23:56:39 +0000 (19:56 -0400)] 
Remove message/subsystem numbers from log messages

Having the numbers in those messages makes some of the unit test
unstable, by causing them to depend on the initialization order of
the naming objects.

6 years agopractracker: regen in master, for bug28925 merged to 0.4.0 and later
teor [Tue, 26 Mar 2019 23:40:03 +0000 (09:40 +1000)] 
practracker: regen in master, for bug28925 merged to 0.4.0 and later

python3 scripts/maint/practracker/practracker.py --regen

6 years agoMerge branch 'maint-0.4.0'
teor [Tue, 26 Mar 2019 23:36:55 +0000 (09:36 +1000)] 
Merge branch 'maint-0.4.0'

6 years agoMerge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
teor [Tue, 26 Mar 2019 23:36:26 +0000 (09:36 +1000)] 
Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0

6 years agoRegenerate practracker file from scratch.
Nick Mathewson [Tue, 26 Mar 2019 23:28:28 +0000 (19:28 -0400)] 
Regenerate practracker file from scratch.

Closes ticket 29912.

Since this is the first time that practracker has had a stable
output order, this diff will be larger than usual.

6 years agoMerge branch 'practracker_regen'
Nick Mathewson [Tue, 26 Mar 2019 23:27:54 +0000 (19:27 -0400)] 
Merge branch 'practracker_regen'

6 years agoMerge branch 'tor-github/pr/842'
George Kadianakis [Tue, 26 Mar 2019 14:41:07 +0000 (16:41 +0200)] 
Merge branch 'tor-github/pr/842'

6 years agoAdd new exceptions.txt entries
Nick Mathewson [Tue, 26 Mar 2019 13:43:46 +0000 (09:43 -0400)] 
Add new exceptions.txt entries

6 years agoMerge branch 'bug29805_rebased_squashed'
Nick Mathewson [Tue, 26 Mar 2019 13:39:46 +0000 (09:39 -0400)] 
Merge branch 'bug29805_rebased_squashed'

6 years agoprob-distr: Some more comments about the initializers.
George Kadianakis [Mon, 25 Mar 2019 13:27:03 +0000 (15:27 +0200)] 
prob-distr: Some more comments about the initializers.

Based on patches and review comments by Riastradh and Catalyst.

Co-authored-by: Taylor R Campbell <campbell+tor@mumble.net>
Co-authored-by: Taylor Yu <catalyst@torproject.org>
6 years agoprob-distr: Silence some coverity warnings.
George Kadianakis [Thu, 21 Mar 2019 18:57:42 +0000 (20:57 +0200)] 
prob-distr: Silence some coverity warnings.

6 years agoMerge branch 'tor-github/pr/709'
George Kadianakis [Tue, 26 Mar 2019 13:34:54 +0000 (15:34 +0200)] 
Merge branch 'tor-github/pr/709'

6 years agoMerge branch 'maint-0.4.0'
George Kadianakis [Tue, 26 Mar 2019 13:16:37 +0000 (15:16 +0200)] 
Merge branch 'maint-0.4.0'

6 years agoMerge branch 'tor-github/pr/847' into maint-0.4.0
George Kadianakis [Tue, 26 Mar 2019 13:16:21 +0000 (15:16 +0200)] 
Merge branch 'tor-github/pr/847' into maint-0.4.0

6 years agopractracker: update usage note in docstring
Nick Mathewson [Tue, 26 Mar 2019 12:42:14 +0000 (08:42 -0400)] 
practracker: update usage note in docstring

6 years agoMerge remote-tracking branch 'tor-github/pr/724'
teor [Tue, 26 Mar 2019 09:31:17 +0000 (19:31 +1000)] 
Merge remote-tracking branch 'tor-github/pr/724'

6 years agoMerge branch 'maint-0.4.0'
teor [Tue, 26 Mar 2019 09:16:06 +0000 (19:16 +1000)] 
Merge branch 'maint-0.4.0'

6 years agoMerge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0
teor [Tue, 26 Mar 2019 09:15:46 +0000 (19:15 +1000)] 
Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0

6 years agoAdd header guards to ptr_helpers.h
rl1987 [Tue, 26 Mar 2019 07:49:32 +0000 (09:49 +0200)] 
Add header guards to ptr_helpers.h

6 years agochanges: add file for #21377
juga0 [Fri, 21 Dec 2018 17:10:19 +0000 (17:10 +0000)] 
changes: add file for #21377

6 years agodircache: fix identation and remove unneded goto
juga0 [Mon, 19 Nov 2018 17:27:41 +0000 (17:27 +0000)] 
dircache: fix identation and remove unneded goto

6 years agobwauth: remove declaring args, they are now in use
juga0 [Thu, 8 Nov 2018 09:13:54 +0000 (09:13 +0000)] 
bwauth: remove declaring args, they are now in use

6 years agotest: check that .../bandwidth.z is compressed
juga0 [Wed, 7 Nov 2018 12:40:51 +0000 (12:40 +0000)] 
test: check that .../bandwidth.z is compressed

6 years agotest: Check bw file cache lifetime
juga0 [Wed, 7 Nov 2018 12:38:45 +0000 (12:38 +0000)] 
test: Check bw file cache lifetime

6 years agobwauth: increment bw file cache lifetime
juga0 [Wed, 7 Nov 2018 12:19:20 +0000 (12:19 +0000)] 
bwauth: increment bw file cache lifetime

Increment bw file cache lifetime when serving it by HTTP.
And add a constant to define that lifetime.

6 years agobwauth: check and use compression serving bw file
juga0 [Wed, 7 Nov 2018 12:15:31 +0000 (12:15 +0000)] 
bwauth: check and use compression serving bw file

6 years agobwauth: check if a bw file could be read
juga0 [Wed, 7 Nov 2018 12:04:09 +0000 (12:04 +0000)] 
bwauth: check if a bw file could be read

Before serving it by HTTP.

6 years agobwauth: use flag to do not warn when file is missing
juga0 [Wed, 7 Nov 2018 08:49:51 +0000 (08:49 +0000)] 
bwauth: use flag to do not warn when file is missing

Use flag to do not warn when the bandwidth file is missing trying
to serve it by http.
Also remove double space in the assignement.

6 years agoServe bandwidth file used in the next vote
juga0 [Fri, 2 Nov 2018 18:38:46 +0000 (18:38 +0000)] 
Serve bandwidth file used in the next vote

When a directory authority is using a bandwidth file to obtain the
bandwidth values that will be included in the next vote, serve this
bandwidth file at /tor/status-vote/next/bandwidth.z.

6 years agoMerge branch 'maint-0.4.0'
teor [Tue, 26 Mar 2019 06:57:04 +0000 (16:57 +1000)] 
Merge branch 'maint-0.4.0'

6 years agoMerge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0
teor [Tue, 26 Mar 2019 06:56:45 +0000 (16:56 +1000)] 
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/833'
teor [Tue, 26 Mar 2019 03:02:37 +0000 (13:02 +1000)] 
Merge remote-tracking branch 'tor-github/pr/833'

6 years agoMerge remote-tracking branch 'tor-github/pr/834'
teor [Tue, 26 Mar 2019 02:55:48 +0000 (12:55 +1000)] 
Merge remote-tracking branch 'tor-github/pr/834'

6 years agoFix CID 1444119
rl1987 [Wed, 20 Mar 2019 17:44:54 +0000 (19:44 +0200)] 
Fix CID 1444119

Let's use the same function exit point for BUG() codepath that we're using
for every other exit condition. That way, we're not forgetting to clean up
the memarea.

6 years agotest/dir: add a 4th argument to dirserv_read_measured_bandwidths()
teor [Thu, 21 Mar 2019 13:35:56 +0000 (23:35 +1000)] 
test/dir: add a 4th argument to dirserv_read_measured_bandwidths()

Part of 29806.

6 years agoMerge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
teor [Tue, 26 Mar 2019 01:48:52 +0000 (11:48 +1000)] 
Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged

6 years agoMerge branch 'tor-github/pr/839'
George Kadianakis [Mon, 25 Mar 2019 23:17:58 +0000 (01:17 +0200)] 
Merge branch 'tor-github/pr/839'

6 years agoRename one case of c_type to c_ptr_type.
Nick Mathewson [Thu, 14 Mar 2019 19:41:45 +0000 (15:41 -0400)] 
Rename one case of c_type to c_ptr_type.

6 years agoRename DISPATCH_DEFINE_TYPE() to DISPATCH_REGISTER_TYPE()
Nick Mathewson [Thu, 14 Mar 2019 19:39:14 +0000 (15:39 -0400)] 
Rename DISPATCH_DEFINE_TYPE() to DISPATCH_REGISTER_TYPE()

Also fix a grammar error in a comment.

6 years agoVarious documentation notes and tweaks for pubsub
Nick Mathewson [Thu, 14 Mar 2019 19:35:41 +0000 (15:35 -0400)] 
Various documentation notes and tweaks for pubsub

6 years agoLog warning messages _before_ exiting because of earlier dcfg failure
Nick Mathewson [Thu, 14 Mar 2019 19:22:19 +0000 (15:22 -0400)] 
Log warning messages _before_ exiting because of earlier dcfg failure

This helps diagnostics.

6 years agoUse actual pointers in dispatch_cfg.c.
Nick Mathewson [Thu, 14 Mar 2019 19:15:03 +0000 (15:15 -0400)] 
Use actual pointers in dispatch_cfg.c.

Previously, I had used integers encoded as pointers.  This
introduced a flaw: NULL represented both the integer zero, and the
absence of a setting.  This in turn made the checks in
cfg_msg_set_{type,chan}() not actually check for an altered value if
the previous value had been set to zero.

Also, I had previously kept a pointer to a dispatch_fypefns_t rather
than making a copy of it.  This meant that if the dispatch_typefns_t
were changed between defining the typefns and creating the
dispatcher, we'd get the modified version.

Found while investigating coverage in pubsub_add_{pub,sub}_()

6 years agoAdd a test for pubsub_items_clear_bindings()
Nick Mathewson [Thu, 14 Mar 2019 17:23:58 +0000 (13:23 -0400)] 
Add a test for pubsub_items_clear_bindings()

6 years agoAdd test for dispatch_send() fast path.
Nick Mathewson [Thu, 14 Mar 2019 15:50:45 +0000 (11:50 -0400)] 
Add test for dispatch_send() fast path.

6 years agopractracker: split shutdown code out of main.c
Nick Mathewson [Thu, 14 Mar 2019 13:37:44 +0000 (09:37 -0400)] 
practracker: split shutdown code out of main.c

This is necessary to get the number of includes in main.c back under
control.  (In the future, we could just use the subsystem manager for
this kind of stuff.)

6 years agopractracker compliance: split lint_message into more logical parts
Nick Mathewson [Thu, 14 Mar 2019 12:54:20 +0000 (08:54 -0400)] 
practracker compliance: split lint_message into more logical parts

6 years agopubsub: add test for items_out in builder_finalize()
Nick Mathewson [Wed, 13 Mar 2019 20:30:56 +0000 (16:30 -0400)] 
pubsub: add test for items_out in builder_finalize()

6 years agocoverage: Exclude lines in pubsub_pub that can only be reached on bug
Nick Mathewson [Wed, 13 Mar 2019 19:56:58 +0000 (15:56 -0400)] 
coverage: Exclude lines in pubsub_pub that can only be reached on bug

6 years agopubsub_check.c: Stop accepting NULL prefix, which we never send.
Nick Mathewson [Wed, 13 Mar 2019 19:54:26 +0000 (15:54 -0400)] 
pubsub_check.c: Stop accepting NULL prefix, which we never send.

(Our code to handle it was broken, too)

6 years agodispatch: Test behavior of formatting type with no set fmt function.
Nick Mathewson [Wed, 13 Mar 2019 19:52:48 +0000 (15:52 -0400)] 
dispatch: Test behavior of formatting type with no set fmt function.

6 years agoUnit test for namemap_fmt_name()
Nick Mathewson [Wed, 13 Mar 2019 19:48:45 +0000 (15:48 -0400)] 
Unit test for namemap_fmt_name()

6 years agopubsub test: add a test to make sure typefns can't be changed.
Nick Mathewson [Wed, 13 Mar 2019 19:41:36 +0000 (15:41 -0400)] 
pubsub test: add a test to make sure typefns can't be changed.

6 years agoTry a different approach to making publish function seem used.
Nick Mathewson [Tue, 12 Mar 2019 23:25:31 +0000 (19:25 -0400)] 
Try a different approach to making publish function seem used.

We want the DISPATCH_ADD_PUB() macro to count as making a
DECLARE_PUBLISH() invocation "used", so let's try a new approach
that preserves that idea.  The old one apparently did not work for
some versions of osx clang.

6 years agomove pubsub_connector_t typedef to pubsub_connect.h
Nick Mathewson [Tue, 12 Mar 2019 23:11:52 +0000 (19:11 -0400)] 
move pubsub_connector_t typedef to pubsub_connect.h

6 years agoCorrect doxygen @file directives
Nick Mathewson [Tue, 12 Mar 2019 22:57:28 +0000 (18:57 -0400)] 
Correct doxygen @file directives

6 years agoDocument several issues found by Taylor
Nick Mathewson [Tue, 12 Mar 2019 22:53:24 +0000 (18:53 -0400)] 
Document several issues found by Taylor

6 years agopubsub: install libevent events separately from the_dispatcher.
Nick Mathewson [Mon, 11 Mar 2019 20:57:33 +0000 (16:57 -0400)] 
pubsub: install libevent events separately from the_dispatcher.

Also, add documentation, and fix a free-on-error bug.

6 years agoConnect the mainloop pubsub dispatcher on startup; free it on shutdown.
Nick Mathewson [Mon, 11 Mar 2019 20:02:38 +0000 (16:02 -0400)] 
Connect the mainloop pubsub dispatcher on startup; free it on shutdown.

6 years agoAdd msgtypes.h include to pubsub_build.h
Nick Mathewson [Mon, 11 Mar 2019 19:56:13 +0000 (15:56 -0400)] 
Add msgtypes.h include to pubsub_build.h

(The header won't compile without it.)

6 years agoCode to manage publish/subscribe setup via subsystem interface.
Nick Mathewson [Tue, 15 Jan 2019 15:27:39 +0000 (10:27 -0500)] 
Code to manage publish/subscribe setup via subsystem interface.

This commit has the necessary logic to run the publish/subscribe
system from the mainloop, and to initialize it on startup and tear
it down later.

6 years agoPubsub: macros for ease-of-use and typesafety.
Nick Mathewson [Mon, 14 Jan 2019 16:29:21 +0000 (11:29 -0500)] 
Pubsub: macros for ease-of-use and typesafety.

6 years agoAdd function to clear publish bindings.
Nick Mathewson [Tue, 15 Jan 2019 15:46:01 +0000 (10:46 -0500)] 
Add function to clear publish bindings.

When we clean up, we'd like to clear all the bindings that refer to
a dispatch_t, so that they don't have dangling pointers to it.

6 years agopubsub: relationship checking functionality
Nick Mathewson [Tue, 15 Jan 2019 14:01:41 +0000 (09:01 -0500)] 
pubsub: relationship checking functionality

This code tries to prevent a large number of possible errors by
enforcing different restrictions on the messages that different
modules publish and subscribe to.

Some of these rules are probably too strict, and some too lax: we
should feel free to change them as needed as we move forward and
learn more.

6 years agoPubsub: an OO layer on top of lib/dispatch
Nick Mathewson [Tue, 15 Jan 2019 14:01:20 +0000 (09:01 -0500)] 
Pubsub: an OO layer on top of lib/dispatch

This "publish/subscribe" layer sits on top of lib/dispatch, and
tries to provide more type-safety and cross-checking for the
lower-level layer.

Even with this commit, we're still not done: more checking will come
in the next commit, and a set of usability/typesafety macros will
come after.

6 years agoDebug logs to record all messages sent and delivered.
Nick Mathewson [Sun, 13 Jan 2019 21:01:44 +0000 (16:01 -0500)] 
Debug logs to record all messages sent and delivered.

6 years agoAdd a naming system for IDs in dispatch.
Nick Mathewson [Sun, 13 Jan 2019 19:43:13 +0000 (14:43 -0500)] 
Add a naming system for IDs in dispatch.

6 years agoLow-level dispatch module for publish-subscribe mechanism
Nick Mathewson [Sat, 12 Jan 2019 01:17:04 +0000 (20:17 -0500)] 
Low-level dispatch module for publish-subscribe mechanism

This module implements a way to send messages from one module to
another, with associated data types.  It does not yet do anything to
ensure that messages are correct, that types match, or that other
forms of consistency are preserved.

6 years agoAdd a new inline function to check whether debug logging is on
Nick Mathewson [Sun, 13 Jan 2019 20:45:06 +0000 (15:45 -0500)] 
Add a new inline function to check whether debug logging is on

We already do this in our log_debug() macro, but there are times
when we'd like to avoid allocating or precomputing something that we
are only going to log if debugging is on.

6 years agoAdd a smartlist_grow() function to expand a smartlist
Nick Mathewson [Thu, 10 Jan 2019 18:56:22 +0000 (13:56 -0500)] 
Add a smartlist_grow() function to expand a smartlist

Tests included.

6 years agoAdd a macro for the fairly common "eat next semicolon" syntax trick
Nick Mathewson [Thu, 10 Jan 2019 15:30:52 +0000 (10:30 -0500)] 
Add a macro for the fairly common "eat next semicolon" syntax trick

You use this when you're defining a macro to be used at file scope,
and you want to require a semicolon afterwards.

6 years agoAdd MESG as a new log domain.
Nick Mathewson [Fri, 26 Oct 2018 20:22:34 +0000 (16:22 -0400)] 
Add MESG as a new log domain.

6 years agoAdd a type to map names to short identifiers
Nick Mathewson [Thu, 25 Oct 2018 16:04:19 +0000 (12:04 -0400)] 
Add a type to map names to short identifiers

We'll be using this for four kinds of identifier in dispatch.c

6 years agoAdd a practracker-regen make target
Nick Mathewson [Mon, 25 Mar 2019 20:07:58 +0000 (16:07 -0400)] 
Add a practracker-regen make target

6 years agopractracker: add ability to regenerate exceptions file.
Nick Mathewson [Mon, 25 Mar 2019 20:06:26 +0000 (16:06 -0400)] 
practracker: add ability to regenerate exceptions file.

Also add a useful argument parser.

6 years agopractracker: pass sys.argv to main() as an argument
Nick Mathewson [Mon, 25 Mar 2019 19:52:43 +0000 (15:52 -0400)] 
practracker: pass sys.argv to main() as an argument

6 years agoPractracker: add a string explaining the excptions file.
Nick Mathewson [Mon, 25 Mar 2019 19:51:48 +0000 (15:51 -0400)] 
Practracker: add a string explaining the excptions file.

6 years agoMerge branch 'practracker_comments'
Nick Mathewson [Mon, 25 Mar 2019 19:18:36 +0000 (15:18 -0400)] 
Merge branch 'practracker_comments'