]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
6 years agochanges file for 31999
Nick Mathewson [Mon, 21 Oct 2019 16:07:44 +0000 (12:07 -0400)] 
changes file for 31999

6 years agoExtract log-granularity code into its own function.
Nick Mathewson [Mon, 21 Oct 2019 15:58:53 +0000 (11:58 -0400)] 
Extract log-granularity code into its own function.

This pleases practracker.

6 years agoAdd tests for options_init_logs()
Nick Mathewson [Mon, 21 Oct 2019 15:42:40 +0000 (11:42 -0400)] 
Add tests for options_init_logs()

6 years agoMake a pair of add_*_log() functions mockable.
Nick Mathewson [Mon, 21 Oct 2019 15:42:20 +0000 (11:42 -0400)] 
Make a pair of add_*_log() functions mockable.

6 years agoMake options_init_logs STATIC for testing.
Nick Mathewson [Thu, 17 Oct 2019 19:28:07 +0000 (15:28 -0400)] 
Make options_init_logs STATIC for testing.

6 years agoUpdate tests to handle new interpretation of quiet_level.
Nick Mathewson [Thu, 17 Oct 2019 17:23:11 +0000 (13:23 -0400)] 
Update tests to handle new interpretation of quiet_level.

Two things needed to be changed.  First, we used to set quiet_level
to the default (QUIET_NONE) when running tests, since we would not
call anything that acted based upon it.  But since we sometimes call
options_init_logs(), we need to pre-set quiet_level to QUIET_SILENT
in the logs so that we don't add the default logs.  This did not
cause test failure: just unwanted logs.

Second, we had a test that checked whether options_validate was
messing with options->Logs correctly.  Since options_validate no
longer messes with the logs, we no longer want a test for this.

6 years agoRationalize handling of quiet_level in config.c
Nick Mathewson [Thu, 17 Oct 2019 17:13:52 +0000 (13:13 -0400)] 
Rationalize handling of quiet_level in config.c

Formerly, we would use quiet_level as an excuse to rewrite the log
configuration, adding a default log line if none existed, and if
RunAsDaemon was not set, and if we were not being invoked via
setconf (!).

This is against our best practices for several reasons:
  * We should not be changing configured options except when the
    user tells us to do so.
  * We should especially not be changing options in the options_validate
    function.
  * Distinguishing whether we are being called from setconf adds a
    risky special-case.

Instead, this patch take a simpler approach: it changes the
interpretation of having no logging lines set to mean: If there is a
stdout, add a default log based on quiet_level.

Solves ticket 31999.

6 years agoMove code to add default log into quiet_level.c
Nick Mathewson [Thu, 17 Oct 2019 16:48:39 +0000 (12:48 -0400)] 
Move code to add default log into quiet_level.c

I'm about to unify the code for handling this between main.c and
config.c.

6 years agoReplace add_temp_log() with add_default_log().
Nick Mathewson [Thu, 17 Oct 2019 16:30:52 +0000 (12:30 -0400)] 
Replace add_temp_log() with add_default_log().

We used to have this function so that we could mark our initial
log-to-stdout as specifically temporary so that we would delete it
once regular logs were configured.  But it's no longer necessary to
mark these logs as temporary, since we now use a mark-and-sweep
process to ensure that _all_ not-configured logs are closed when we
change our configuration.

Instead, this function will be the basis of a refactoring in how we
handle default logs.

6 years agoMerge branch 'cmdline_refactor'
Nick Mathewson [Thu, 17 Oct 2019 16:01:45 +0000 (12:01 -0400)] 
Merge branch 'cmdline_refactor'

6 years agoUse an enum for quiet_level.
Nick Mathewson [Wed, 16 Oct 2019 20:49:54 +0000 (16:49 -0400)] 
Use an enum for quiet_level.

6 years agoRename CMD_OTHER to CMD_IMMEDIATE
Nick Mathewson [Wed, 16 Oct 2019 20:39:58 +0000 (16:39 -0400)] 
Rename CMD_OTHER to CMD_IMMEDIATE

6 years agofixup! Print the error message for --dump-config even if no arguments are given.
Nick Mathewson [Wed, 16 Oct 2019 20:31:17 +0000 (16:31 -0400)] 
fixup! Print the error message for --dump-config even if no arguments are given.

Fix a spelling error.

6 years agoAdd a test for a command-line option without a value.
Nick Mathewson [Tue, 8 Oct 2019 19:58:14 +0000 (15:58 -0400)] 
Add a test for a command-line option without a value.

6 years agoadd a changes file for 32003 (command-line option parsing).
Nick Mathewson [Tue, 8 Oct 2019 17:21:24 +0000 (13:21 -0400)] 
add a changes file for 32003 (command-line option parsing).

6 years agoMove responsibility for setting the "quiet level" into a table.
Nick Mathewson [Tue, 8 Oct 2019 17:13:31 +0000 (13:13 -0400)] 
Move responsibility for setting the "quiet level" into a table.

Previously this was done with a big list of options in main.c which
implied "hush" or "quiet".  One of these options ("--digests") no
longer existed, but we still checked for it.

Now we use the table of command-line-only arguments to set this
value.

6 years agoMake the command-line parser understand "commands".
Nick Mathewson [Tue, 8 Oct 2019 20:05:04 +0000 (16:05 -0400)] 
Make the command-line parser understand "commands".

Previously these were implemented with a search in
options_init_from_torrc(), but that led to each option being
declared more than needed: once to say that it was a valid option,
and once to say what it meant.

6 years agoAdd a return type for the parsed commandline.
Nick Mathewson [Tue, 8 Oct 2019 15:47:43 +0000 (11:47 -0400)] 
Add a return type for the parsed commandline.

Previously it was stored in two outvars, but this is more
elegant. I'm going to be expanding this struct in later commits.

6 years agoMerge branch 'ticket31373_042_01_squashed'
Nick Mathewson [Thu, 17 Oct 2019 14:09:16 +0000 (10:09 -0400)] 
Merge branch 'ticket31373_042_01_squashed'

6 years agoPrint summary at the end of the configure script
David Goulet [Thu, 8 Aug 2019 14:08:02 +0000 (10:08 -0400)] 
Print summary at the end of the configure script

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agohs_cache.c: fix HTML tags in doxygen comments.
Nick Mathewson [Thu, 17 Oct 2019 12:27:17 +0000 (08:27 -0400)] 
hs_cache.c: fix HTML tags in doxygen comments.

6 years agoMerge remote-tracking branch 'tor-github/pr/1416'
Nick Mathewson [Thu, 17 Oct 2019 12:25:11 +0000 (08:25 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1416'

6 years agoMerge branch 'maint-0.4.2'
teor [Thu, 17 Oct 2019 04:52:19 +0000 (14:52 +1000)] 
Merge branch 'maint-0.4.2'

6 years agoMerge branch 'maint-0.4.1' into maint-0.4.2
teor [Thu, 17 Oct 2019 04:52:15 +0000 (14:52 +1000)] 
Merge branch 'maint-0.4.1' into maint-0.4.2

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
teor [Thu, 17 Oct 2019 04:52:06 +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 [Thu, 17 Oct 2019 04:51:58 +0000 (14:51 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.5
teor [Thu, 17 Oct 2019 04:51:50 +0000 (14:51 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1373' into maint-0.4.2
teor [Thu, 17 Oct 2019 04:51:30 +0000 (14:51 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1373' into maint-0.4.2

6 years agoMerge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1
teor [Thu, 17 Oct 2019 04:51:02 +0000 (14:51 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1

6 years agoMerge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5
teor [Thu, 17 Oct 2019 04:50:28 +0000 (14:50 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9
teor [Thu, 17 Oct 2019 04:49:52 +0000 (14:49 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/1419'
teor [Thu, 17 Oct 2019 03:47:42 +0000 (13:47 +1000)] 
Merge remote-tracking branch 'tor-github/pr/1419'

Obviously correct fixes to code that's already been reviewed.

6 years agoMerge remote-tracking branch 'tor-github/pr/1329'
Nick Mathewson [Wed, 16 Oct 2019 16:31:47 +0000 (12:31 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1329'

6 years agohs_cell.[ch]: repair doxygen.
Nick Mathewson [Wed, 16 Oct 2019 16:08:38 +0000 (12:08 -0400)] 
hs_cell.[ch]: repair doxygen.

6 years agoor_options_st.h: repair some doxygen comments.
Nick Mathewson [Wed, 16 Oct 2019 16:05:17 +0000 (12:05 -0400)] 
or_options_st.h: repair some doxygen comments.

6 years agoshared_random.[ch]: repair doxygen comments
Nick Mathewson [Wed, 16 Oct 2019 16:04:53 +0000 (12:04 -0400)] 
shared_random.[ch]: repair doxygen comments

6 years agohs_cache.[ch]: repair doxygen comments.
Nick Mathewson [Wed, 16 Oct 2019 15:57:44 +0000 (11:57 -0400)] 
hs_cache.[ch]: repair doxygen comments.

6 years agohs_client.[ch]: fix doxygen comments by using /**.
Nick Mathewson [Wed, 16 Oct 2019 15:51:47 +0000 (11:51 -0400)] 
hs_client.[ch]: fix doxygen comments by using /**.

6 years agoshared_random_state.[ch]: Repair a bunch of doxygen comments
Nick Mathewson [Wed, 16 Oct 2019 15:44:30 +0000 (11:44 -0400)] 
shared_random_state.[ch]: Repair a bunch of doxygen comments

These need to start with /**, not /*.

6 years agohs_common.[ch]: repair doxygen comments by replacing /* with /**
Nick Mathewson [Wed, 16 Oct 2019 15:39:10 +0000 (11:39 -0400)] 
hs_common.[ch]: repair doxygen comments by replacing /* with /**

6 years agohs_descriptor.[ch]: repair doxygen comments.
Nick Mathewson [Wed, 16 Oct 2019 15:33:03 +0000 (11:33 -0400)] 
hs_descriptor.[ch]: repair doxygen comments.

These are yet more that were not made with "/**"

6 years agohs_service.c: repair doxygen comments
Nick Mathewson [Wed, 16 Oct 2019 15:26:20 +0000 (11:26 -0400)] 
hs_service.c: repair doxygen comments

6 years agohs_service.h: repair doxygen comments.
Nick Mathewson [Wed, 16 Oct 2019 15:18:43 +0000 (11:18 -0400)] 
hs_service.h: repair doxygen comments.

6 years agoaddress_set.c: doxygen comment repair.
Nick Mathewson [Wed, 16 Oct 2019 15:15:25 +0000 (11:15 -0400)] 
address_set.c: doxygen comment repair.

6 years agochannel.h: fix various doxygen warnings
Nick Mathewson [Wed, 16 Oct 2019 15:11:43 +0000 (11:11 -0400)] 
channel.h: fix various doxygen warnings

There were a bunch of items where the doxygen comments were
formatted incorrectly (with /* instead of /**)

6 years agovoting_schedule: fix doxygen comments to use /**
Nick Mathewson [Wed, 16 Oct 2019 15:08:34 +0000 (11:08 -0400)] 
voting_schedule: fix doxygen comments to use /**

Previously some of the comments here used /*.

6 years agoTell doxygen not to pay attention to __attribute__.
Nick Mathewson [Wed, 16 Oct 2019 15:02:49 +0000 (11:02 -0400)] 
Tell doxygen not to pay attention to __attribute__.

6 years agoTeach Doxygen to handle MOCK_{DECL,IMPL}
Nick Mathewson [Wed, 16 Oct 2019 14:59:29 +0000 (10:59 -0400)] 
Teach Doxygen to handle MOCK_{DECL,IMPL}

6 years agoRename authcert_members.i to .h, and have it define a macro.
Nick Mathewson [Wed, 16 Oct 2019 14:53:01 +0000 (10:53 -0400)] 
Rename authcert_members.i to .h, and have it define a macro.

Including a file in the middle of a declaration seems to confuse
Doxygen, and Coccinelle doesn't much like it either.l

6 years agoMake doc/doxygen before running doxygen.
Nick Mathewson [Wed, 16 Oct 2019 14:31:44 +0000 (10:31 -0400)] 
Make doc/doxygen before running doxygen.

This makes out-of-tree doxygen builds work.

Closes ticket 32113.

6 years agoMerge branch 'ticket32099'
Nick Mathewson [Wed, 16 Oct 2019 14:28:03 +0000 (10:28 -0400)] 
Merge branch 'ticket32099'

6 years agoMerge branch 'ticket32110'
Nick Mathewson [Wed, 16 Oct 2019 14:14:51 +0000 (10:14 -0400)] 
Merge branch 'ticket32110'

6 years agoDoxygen: stop producing LaTeX.
Nick Mathewson [Wed, 16 Oct 2019 13:56:31 +0000 (09:56 -0400)] 
Doxygen: stop producing LaTeX.

Running doxygen with latex gave us all manner of unicode issues,
slowed down the "make doxygen" target by a lot, and added several
latex dependencies... all to produce a 4000-page reference manual
which is probably not what anybody wanted.

Closes ticket 32099.

6 years agoRegenerate practracker exceptions file for 0.4.3 progress.
Nick Mathewson [Wed, 16 Oct 2019 13:13:01 +0000 (09:13 -0400)] 
Regenerate practracker exceptions file for 0.4.3 progress.

6 years agopractracker: add a missing #.
Nick Mathewson [Wed, 16 Oct 2019 13:14:01 +0000 (09:14 -0400)] 
practracker: add a missing #.

6 years agoDoxygen: update doxyfile to a more recent version.
Nick Mathewson [Wed, 16 Oct 2019 13:07:21 +0000 (09:07 -0400)] 
Doxygen: update doxyfile to a more recent version.

I have left the settings at their old values, except when they
referred to nonexistent files.

Closes ticket 32110

6 years agoDoxygen: Fix things that looked like links.
Nick Mathewson [Wed, 16 Oct 2019 12:44:35 +0000 (08:44 -0400)] 
Doxygen: Fix things that looked like links.

Doxygen thinks that saying #foo is linking to a "foo" anchor
someplace.

6 years agoDoxygen: fix unrecognized commands.
Nick Mathewson [Wed, 16 Oct 2019 12:39:41 +0000 (08:39 -0400)] 
Doxygen: fix unrecognized commands.

Doxygen seems to interpret anything starting with \ as a command,
even when we don't mean it that way.

6 years agoDoxygen: fix warnings about mismatched HTML tags.
Nick Mathewson [Wed, 16 Oct 2019 12:25:10 +0000 (08:25 -0400)] 
Doxygen: fix warnings about mismatched HTML tags.

6 years agoDoxygen: Fix mismatched filenames.
Nick Mathewson [Wed, 16 Oct 2019 12:18:26 +0000 (08:18 -0400)] 
Doxygen: Fix mismatched filenames.

In 8 places, our \file declarations didn't match the actual files
they were in.

6 years agonever say XB, always XBytes
Roger Dingledine [Wed, 16 Oct 2019 07:31:23 +0000 (03:31 -0400)] 
never say XB, always XBytes

fix three more instances in the man page that we forgot to fix
in earlier attempts

6 years agoscripts: Fix a git script comment
teor [Tue, 15 Oct 2019 03:58:53 +0000 (13:58 +1000)] 
scripts: Fix a git script comment

6 years agoscripts: Merge forward test branch _042 into test branch _master
teor [Tue, 15 Oct 2019 03:36:56 +0000 (13:36 +1000)] 
scripts: Merge forward test branch _042 into test branch _master

Fixes an issue where test branch _041 was merged into _042 and _master.
This issue only affects test branch mode (-t).

6 years agoMerge branch 'design_revision'
Nick Mathewson [Mon, 14 Oct 2019 19:56:49 +0000 (15:56 -0400)] 
Merge branch 'design_revision'

6 years agoMerge branch 'maint-0.4.2'
Nick Mathewson [Mon, 14 Oct 2019 19:55:27 +0000 (15:55 -0400)] 
Merge branch 'maint-0.4.2'

6 years agoMerge remote-tracking branch 'tor-github/pr/1393' into maint-0.4.2
Nick Mathewson [Mon, 14 Oct 2019 19:55:13 +0000 (15:55 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1393' into maint-0.4.2

6 years agodoc/HACKING/design: address comments from ahf
Nick Mathewson [Mon, 14 Oct 2019 19:53:04 +0000 (15:53 -0400)] 
doc/HACKING/design: address comments from ahf

6 years agoEdit 01b-collections.md a bit for md and missing content
Nick Mathewson [Mon, 14 Oct 2019 19:05:47 +0000 (15:05 -0400)] 
Edit 01b-collections.md a bit for md and missing content

6 years agoEdit 01a-memory.md
Nick Mathewson [Mon, 14 Oct 2019 19:02:26 +0000 (15:02 -0400)] 
Edit 01a-memory.md

6 years agoReplace a unicode character which doxygen cannot handle.
Nick Mathewson [Mon, 14 Oct 2019 18:05:50 +0000 (14:05 -0400)] 
Replace a unicode character which doxygen cannot handle.

Merging without review, as this is an editorial fix in a comment.

6 years agoRewrite "common" overview into a "lib" overview.
Nick Mathewson [Mon, 14 Oct 2019 17:49:27 +0000 (13:49 -0400)] 
Rewrite "common" overview into a "lib" overview.

6 years agoRename common-utils to lib-overview.
Nick Mathewson [Mon, 14 Oct 2019 14:59:32 +0000 (10:59 -0400)] 
Rename common-utils to lib-overview.

6 years ago00-overview.md: Revise to describe intended document structure
Nick Mathewson [Mon, 14 Oct 2019 14:57:15 +0000 (10:57 -0400)] 
00-overview.md: Revise to describe intended document structure

6 years agogit scripts: add maint/release-0.4.2.
Nick Mathewson [Fri, 11 Oct 2019 21:26:34 +0000 (17:26 -0400)] 
git scripts: add maint/release-0.4.2.

6 years agoMerge branch 'maint-0.4.2'
Nick Mathewson [Fri, 11 Oct 2019 21:20:54 +0000 (17:20 -0400)] 
Merge branch 'maint-0.4.2'

"Ours" merge to avoid takign ".enable_practracker_in_hooks"

6 years agomaint-0.4.2: remove ".enable_practracker_in_hooks".
Nick Mathewson [Fri, 11 Oct 2019 21:18:55 +0000 (17:18 -0400)] 
maint-0.4.2: remove ".enable_practracker_in_hooks".

6 years agoBump master to 0.4.3.0-alpha-dev. tor-0.4.3.0-alpha-dev
Nick Mathewson [Fri, 11 Oct 2019 21:15:04 +0000 (17:15 -0400)] 
Bump master to 0.4.3.0-alpha-dev.

6 years agoMerge branch 'ticket31682_042_01_squashed'
Nick Mathewson [Fri, 11 Oct 2019 14:21:58 +0000 (10:21 -0400)] 
Merge branch 'ticket31682_042_01_squashed'

6 years agoCorrect comment on build_establish_intro_dos_extension
Nick Mathewson [Fri, 11 Oct 2019 14:21:45 +0000 (10:21 -0400)] 
Correct comment on build_establish_intro_dos_extension

6 years agohs-v3: Fix implicit ssize_t to size_t conversion
David Goulet [Wed, 2 Oct 2019 17:19:51 +0000 (13:19 -0400)] 
hs-v3: Fix implicit ssize_t to size_t conversion

Found by Coverity.

Fixes #31682

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge remote-tracking branch 'tor-github/pr/1394'
Nick Mathewson [Wed, 9 Oct 2019 20:44:12 +0000 (16:44 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1394'

6 years agoMerge remote-tracking branch 'tor-github/pr/1399'
Nick Mathewson [Wed, 9 Oct 2019 20:37:47 +0000 (16:37 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1399'

6 years agoMerge remote-tracking branch 'tor-github/pr/1401'
Nick Mathewson [Wed, 9 Oct 2019 20:29:46 +0000 (16:29 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1401'

6 years agoMerge branch 'bug30344_squashed_035'
Nick Mathewson [Wed, 9 Oct 2019 20:26:31 +0000 (16:26 -0400)] 
Merge branch 'bug30344_squashed_035'

6 years agoStop libevent from reading data from closed connections.
George Kadianakis [Mon, 30 Sep 2019 15:29:00 +0000 (18:29 +0300)] 
Stop libevent from reading data from closed connections.

Code adapted from Rob's proposed patch in #30344.

Also add a comment in connection_mark_for_close_internal_() on why we should
not be adding extra code there without a very good reason.

6 years agotest: New behavior on IP retry for HSv3
Neel Chauhan [Wed, 18 Sep 2019 15:40:10 +0000 (11:40 -0400)] 
test: New behavior on IP retry for HSv3

Unit test for #31652 where if we are over the retry limit for the IP but we
have an established circuit, we don't remove the IP.

Part of #31652

6 years agohs-v3: Do not remove intro point if circuit exists
David Goulet [Tue, 10 Sep 2019 18:40:40 +0000 (14:40 -0400)] 
hs-v3: Do not remove intro point if circuit exists

When considering introduction point of a service's descriptor, do not remove
an intro point that has an established or pending circuit.

Fixes #31652

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge branch 'tor-github/pr/1381'
David Goulet [Tue, 8 Oct 2019 18:49:39 +0000 (14:49 -0400)] 
Merge branch 'tor-github/pr/1381'

6 years agoconfig.c: make a couple of arguments const.
Nick Mathewson [Tue, 8 Oct 2019 15:37:46 +0000 (11:37 -0400)] 
config.c: make a couple of arguments const.

These functions do not modify their inputs, so they can take const
arguments.

6 years agoUse C99 struct-initializer syntax in COMMANDLINE_ONLY_OPTIONS
Nick Mathewson [Tue, 8 Oct 2019 14:54:57 +0000 (10:54 -0400)] 
Use C99 struct-initializer syntax in COMMANDLINE_ONLY_OPTIONS

I'm about to add more fields to this table, and this syntax change
will make it easier to do so.

6 years agoDocument takes_argument_t and its members.
Nick Mathewson [Tue, 8 Oct 2019 14:50:53 +0000 (10:50 -0400)] 
Document takes_argument_t and its members.

6 years agoRename TAKES_NO_ARGUMENT to ARGUMENT_NONE.
Nick Mathewson [Tue, 8 Oct 2019 14:46:16 +0000 (10:46 -0400)] 
Rename TAKES_NO_ARGUMENT to ARGUMENT_NONE.

I'm doing this for consistency, so that all the values for this enum
have the same prefix.

This is an automated commit, generated by the following shell commands:

for fn in $(git ls-tree --name-only -r HEAD src |grep '\.[ch]$'); do \
    perl -i -pe 's!\bTAKES_NO_ARGUMENT\b!ARGUMENT_NONE!g;' "$fn"; \
done

6 years agoExtract the enumeration that tells Tor what command it is running.
Nick Mathewson [Tue, 8 Oct 2019 14:41:49 +0000 (10:41 -0400)] 
Extract the enumeration that tells Tor what command it is running.

6 years agoFix flapping of test_service_intro_point() unittest.
George Kadianakis [Tue, 8 Oct 2019 15:59:27 +0000 (18:59 +0300)] 
Fix flapping of test_service_intro_point() unittest.

6 years agoMerge remote-tracking branch 'tor-github/pr/1317'
Nick Mathewson [Mon, 7 Oct 2019 14:23:44 +0000 (10:23 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1317'

6 years agoMerge branch 'ticket31548_035_01_squashed'
Nick Mathewson [Mon, 7 Oct 2019 14:21:40 +0000 (10:21 -0400)] 
Merge branch 'ticket31548_035_01_squashed'

6 years agohs-v3: Make service pick the exact amount of intro points
David Goulet [Thu, 29 Aug 2019 14:46:24 +0000 (10:46 -0400)] 
hs-v3: Make service pick the exact amount of intro points

When encoding introduction points, we were not checking if that intro points
had an established circuit.

When botting up, the service will pick, by default, 3 + 2 intro points and the
first 3 that establish, we use them and upload the descriptor.

However, the intro point is removed from the service descriptor list only when
the circuit has opened and we see that we have already enough intro points, it
is then removed.

But it is possible that the service establishes 3 intro points successfully
before the other(s) have even opened yet.

This lead to the service encoding extra intro points in the descriptor even
though the circuit is not opened or might never establish (#31561).

Fixes #31548

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge remote-tracking branch 'tor-github/pr/1379'
Nick Mathewson [Mon, 7 Oct 2019 14:15:46 +0000 (10:15 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1379'

6 years agoMerge remote-tracking branch 'tor-github/pr/1390'
Nick Mathewson [Mon, 7 Oct 2019 14:13:32 +0000 (10:13 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1390'

6 years agobump to 0.4.2.2-alpha-dev
Nick Mathewson [Mon, 7 Oct 2019 13:32:26 +0000 (09:32 -0400)] 
bump to 0.4.2.2-alpha-dev