]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
6 years agopractracker: restore exceptions.txt header when running --regen
Nick Mathewson [Thu, 1 Aug 2019 14:25:20 +0000 (10:25 -0400)] 
practracker: restore exceptions.txt header when running --regen

6 years agoMerge branch 'tor-github/pr/1177'
David Goulet [Thu, 1 Aug 2019 14:18:10 +0000 (10:18 -0400)] 
Merge branch 'tor-github/pr/1177'

6 years agopractracker: replaces "overstrict" with "overbroad"
Nick Mathewson [Thu, 1 Aug 2019 13:35:33 +0000 (09:35 -0400)] 
practracker: replaces "overstrict" with "overbroad"

I had the logic reversed here.

6 years agoLower check of TOR_DISABLE_PRACTRACKER
Nick Mathewson [Thu, 1 Aug 2019 12:40:56 +0000 (08:40 -0400)] 
Lower check of TOR_DISABLE_PRACTRACKER

Since we sometimes call practracker directly, that's where we should
check the TOR_DISABLE_PRACTRACKER envvar.

6 years agoPractracker: add an integration test.
Nick Mathewson [Tue, 30 Jul 2019 16:07:40 +0000 (12:07 -0400)] 
Practracker: add an integration test.

This test runs practracker with a set of 0 thresholds, to make sure
that it enumerates all its values right.  It tries running with an
empty exceptions file, and with an exceptions file that covers
_some_ of the data, and it makes sure that the outputs are as expected.

6 years agopractracker: better warning/regen handling
Nick Mathewson [Tue, 30 Jul 2019 15:54:05 +0000 (11:54 -0400)] 
practracker: better warning/regen handling

Now that there is only one toplevel place where we print problems,
we can redirect just that one print to a file when we are
regenerating the exceptions.txt file.  Previously we redirected
sys.stdout, which is naughty, and forced us to send warnings (and
warnings alone) to stderr.

6 years agoPractracker: new flags to control output.
Nick Mathewson [Tue, 30 Jul 2019 15:49:50 +0000 (11:49 -0400)] 
Practracker: new flags to control output.

These flags let you suppress the message about the number of
problems and warnings, and let you control the thresholds above
which something counts as a problem.

I need this for testing.

6 years agopractracker: Remove problemvault global.
Nick Mathewson [Tue, 30 Jul 2019 14:17:19 +0000 (10:17 -0400)] 
practracker: Remove problemvault global.

6 years agopractracker: Move the warning/error distinction to a higher level.
Nick Mathewson [Tue, 30 Jul 2019 14:15:11 +0000 (10:15 -0400)] 
practracker: Move the warning/error distinction to a higher level.

Previously warnings were generated by magic inside ProblemVault; now
they're printed on demand.

6 years agopractracker: Refactor flow to use generators
Nick Mathewson [Tue, 30 Jul 2019 13:20:08 +0000 (09:20 -0400)] 
practracker: Refactor flow to use generators

Instead of having "consider" functions that have to call a global
ProblemVault, we can now generate all the metrics for the code
separately from the decision about what to do for them.

6 years agopractracker: Rename "Problem" to "Item".
Nick Mathewson [Tue, 30 Jul 2019 13:03:55 +0000 (09:03 -0400)] 
practracker: Rename "Problem" to "Item".

I'm about to refactor the code into a set of iterators that yield
*all* the metrics for the code, and then add a filter on top of that
to return the problems.

6 years agoMerge branch 'maint-0.4.1'
David Goulet [Mon, 29 Jul 2019 16:02:54 +0000 (12:02 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'tor-github/pr/1179' into maint-0.4.1
David Goulet [Mon, 29 Jul 2019 16:02:47 +0000 (12:02 -0400)] 
Merge branch 'tor-github/pr/1179' into maint-0.4.1

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Fri, 26 Jul 2019 01:52:02 +0000 (21:52 -0400)] 
Merge branch 'maint-0.4.1'

"ours" to avoid version bump.

6 years agobump to 0.4.1.4-rc-dev
Nick Mathewson [Fri, 26 Jul 2019 01:51:53 +0000 (21:51 -0400)] 
bump to 0.4.1.4-rc-dev

6 years agoforward-port the changelog for 0.4.1.4-rc
Nick Mathewson [Fri, 26 Jul 2019 01:44:17 +0000 (21:44 -0400)] 
forward-port the changelog for 0.4.1.4-rc

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Fri, 26 Jul 2019 00:11:47 +0000 (20:11 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoFix more 32-bit errors with domain and tt_int_op
Nick Mathewson [Fri, 26 Jul 2019 00:11:33 +0000 (20:11 -0400)] 
Fix more 32-bit errors with domain and tt_int_op

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Thu, 25 Jul 2019 20:57:32 +0000 (16:57 -0400)] 
Merge branch 'maint-0.4.1'

6 years agotest: Use a 64-bit comparison for logging domains.
Nick Mathewson [Thu, 25 Jul 2019 20:57:06 +0000 (16:57 -0400)] 
test: Use a 64-bit comparison for logging domains.

6 years agopractracker: Make it happing for circuitpadding.c
David Goulet [Thu, 25 Jul 2019 14:28:38 +0000 (10:28 -0400)] 
practracker: Make it happing for circuitpadding.c

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge branch 'maint-0.4.1'
David Goulet [Thu, 25 Jul 2019 14:27:41 +0000 (10:27 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoAlways check the retval of circpad_machine_current_state().
George Kadianakis [Sat, 29 Jun 2019 16:46:43 +0000 (19:46 +0300)] 
Always check the retval of circpad_machine_current_state().

6 years agoRemove dead code from circpad_machine_remove_token().
George Kadianakis [Sat, 29 Jun 2019 16:38:14 +0000 (19:38 +0300)] 
Remove dead code from circpad_machine_remove_token().

6 years agoMerge branch 'maint-0.4.1'
David Goulet [Thu, 25 Jul 2019 13:03:01 +0000 (09:03 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'tor-github/pr/1171' into maint-0.4.1
David Goulet [Thu, 25 Jul 2019 13:02:53 +0000 (09:02 -0400)] 
Merge branch 'tor-github/pr/1171' into maint-0.4.1

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Thu, 25 Jul 2019 13:01:20 +0000 (09:01 -0400)] 
Merge branch 'maint-0.4.1'

"ours" to avoid version bump.

6 years agoBump version to 0.4.1.4-rc
Nick Mathewson [Thu, 25 Jul 2019 13:00:53 +0000 (09:00 -0400)] 
Bump version to 0.4.1.4-rc

6 years agoFix clang-detected errors related to log_domain_mask_t
Nick Mathewson [Wed, 24 Jul 2019 13:08:48 +0000 (09:08 -0400)] 
Fix clang-detected errors related to log_domain_mask_t

6 years agoMerge branch 'maint-0.4.1'
George Kadianakis [Wed, 24 Jul 2019 09:32:06 +0000 (12:32 +0300)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'tor-github/pr/1181' into maint-0.4.1
George Kadianakis [Wed, 24 Jul 2019 09:31:56 +0000 (12:31 +0300)] 
Merge branch 'tor-github/pr/1181' into maint-0.4.1

6 years agoMerge branch 'tor-github/pr/1165'
George Kadianakis [Wed, 24 Jul 2019 09:29:57 +0000 (12:29 +0300)] 
Merge branch 'tor-github/pr/1165'

6 years agoMerge branch 'ticket24963_042_02'
Nick Mathewson [Tue, 23 Jul 2019 18:03:30 +0000 (14:03 -0400)] 
Merge branch 'ticket24963_042_02'

6 years agoAdd a test for disallowing single-hop introductions.
Nick Mathewson [Tue, 23 Jul 2019 16:42:33 +0000 (12:42 -0400)] 
Add a test for disallowing single-hop introductions.

Code from dgoulet.

6 years agoAllow NULL circ->p_chan in circuit_is_suitable_for_introduce1()
Nick Mathewson [Tue, 23 Jul 2019 16:36:40 +0000 (12:36 -0400)] 
Allow NULL circ->p_chan in circuit_is_suitable_for_introduce1()

This shouldn't be possible while Tor is running, but the tests can
hit this code.  Rather than force the tests to add a dummy channel
object, let's just tolerate their incompletely built circuits.

6 years agoMerge remote-tracking branch 'tor-github/pr/1185'
Nick Mathewson [Tue, 23 Jul 2019 16:32:14 +0000 (12:32 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1185'

6 years agoMerge remote-tracking branch 'tor-github/pr/1186'
Nick Mathewson [Tue, 23 Jul 2019 16:30:19 +0000 (12:30 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1186'

6 years agoMerge branch 'tor-github/pr/1116'
David Goulet [Tue, 23 Jul 2019 13:46:29 +0000 (09:46 -0400)] 
Merge branch 'tor-github/pr/1116'

6 years agoMerge branch 'tor-github/pr/1153'
David Goulet [Tue, 23 Jul 2019 13:43:36 +0000 (09:43 -0400)] 
Merge branch 'tor-github/pr/1153'

6 years agoMerge branch 'maint-0.4.1'
David Goulet [Tue, 23 Jul 2019 13:39:51 +0000 (09:39 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'tor-github/pr/1158' into maint-0.4.1
David Goulet [Tue, 23 Jul 2019 13:39:43 +0000 (09:39 -0400)] 
Merge branch 'tor-github/pr/1158' into maint-0.4.1

6 years agoChanges file for #31113.
George Kadianakis [Tue, 23 Jul 2019 09:40:33 +0000 (12:40 +0300)] 
Changes file for #31113.

6 years agoImprove circpad documentation.
pulls [Mon, 8 Jul 2019 14:53:29 +0000 (16:53 +0200)] 
Improve circpad documentation.

Patch by Tobias Pulls.

6 years agoAdd changes file for #31112 and #31098.
George Kadianakis [Tue, 23 Jul 2019 08:46:07 +0000 (11:46 +0300)] 
Add changes file for #31112 and #31098.

6 years agotransition when we send our first padding packet, not on received
pulls [Mon, 8 Jul 2019 13:51:57 +0000 (15:51 +0200)] 
transition when we send our first padding packet, not on received

6 years agoremove specified target_hopnum from relay-side machines (only for origin-side machines)
pulls [Mon, 8 Jul 2019 16:09:14 +0000 (18:09 +0200)] 
remove specified target_hopnum from relay-side machines (only for origin-side machines)

6 years agoExtract the log_domain_t type to a lower-level header
Nick Mathewson [Fri, 19 Jul 2019 14:17:22 +0000 (10:17 -0400)] 
Extract the log_domain_t type to a lower-level header

This way, both err and log may depend on it.

6 years agoAdjust tor_log.rs for 64-bit log domains.
Nick Mathewson [Fri, 19 Jul 2019 14:07:32 +0000 (10:07 -0400)] 
Adjust tor_log.rs for 64-bit log domains.

6 years agoSet 'routerlist' global to NULL before freeing it.
Nick Mathewson [Fri, 19 Jul 2019 13:49:52 +0000 (09:49 -0400)] 
Set 'routerlist' global to NULL before freeing it.

There is other code that uses this value, and some of it is
apparently reachable from inside router_dir_info_changed(), which
routerlist_free() apparently calls.  (ouch!)  This is a minimal fix
to try to resolve the issue without causing other problems.

Fixes bug 31003. I'm calling this a bugfix on 0.1.2.2-alpha, where
the call to router_dir_info_changed() was added to routerlist_free().

6 years agoChanges file for bug 31001
Nick Mathewson [Fri, 19 Jul 2019 13:21:08 +0000 (09:21 -0400)] 
Changes file for bug 31001

6 years agoPrevent UB on signed overflow.
Tobias Stoeckmann [Mon, 24 Jun 2019 20:08:49 +0000 (22:08 +0200)] 
Prevent UB on signed overflow.

Overflowing a signed integer in C is an undefined behaviour.
It is possible to trigger this undefined behaviour in tor_asprintf on
Windows or systems lacking vasprintf.

On these systems, eiter _vscprintf or vsnprintf is called to retrieve
the required amount of bytes to hold the string. These functions can
return INT_MAX. The easiest way to recreate this is the use of a
specially crafted configuration file, e.g. containing the line:

FirewallPorts AAAAA<in total 2147483610 As>

This line triggers the needed tor_asprintf call which eventually
leads to an INT_MAX return value from _vscprintf or vsnprintf.

The needed byte for \0 is added to the result, triggering the
overflow and therefore the undefined behaviour.

Casting the value to size_t before addition fixes the behaviour.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
6 years agochanges file for 30752
Nick Mathewson [Thu, 18 Jul 2019 13:27:58 +0000 (09:27 -0400)] 
changes file for 30752

6 years agoAdd a TOR_DISABLE_PRACTRACKER envvar for use by folks who don't care
Nick Mathewson [Wed, 17 Jul 2019 13:28:48 +0000 (15:28 +0200)] 
Add a TOR_DISABLE_PRACTRACKER envvar for use by folks who don't care

Fixes part of bug 30752

6 years agoPractracker: add tolerances for exceptions
Nick Mathewson [Wed, 17 Jul 2019 13:20:58 +0000 (15:20 +0200)] 
Practracker: add tolerances for exceptions

When an exception is present, we can now violate the limit by a little
bit and only produce a warning.  The strict flag overrides this
behavior.

I've given file sizes a 2% tolerances and function sizes/include
counts a 10% tolerance.

Part of 30752

6 years agoPractracker: add a --list-overstrict option
Nick Mathewson [Wed, 17 Jul 2019 13:06:34 +0000 (15:06 +0200)] 
Practracker: add a --list-overstrict option

This option lists every exception that is stricter than it needs to
be.

Part of 30752

6 years agoChanges file for 29746.
Nick Mathewson [Thu, 18 Jul 2019 13:27:49 +0000 (09:27 -0400)] 
Changes file for 29746.

6 years agoPractracker: improve exclude-directory logic
Nick Mathewson [Wed, 17 Jul 2019 12:30:12 +0000 (14:30 +0200)] 
Practracker: improve exclude-directory logic

Instead of excluding directories at the last minute if they happen
to appear in our filenames, we exclude them early, before recursing
into all their subdirectories.

Part of 29746.

6 years agoPracktracker: give the number of new errors found.
Nick Mathewson [Wed, 17 Jul 2019 12:09:47 +0000 (14:09 +0200)] 
Pracktracker: give the number of new errors found.

Part of 29746.

6 years agoPractracker: allow tabs in include lines
Nick Mathewson [Wed, 17 Jul 2019 12:02:17 +0000 (14:02 +0200)] 
Practracker: allow tabs in include lines

This isn't actually something that Tor does, but it's cleaner to do
it this way.  Part of 29746.

6 years agoFix practracker_tests.py and practracker line counting.
Nick Mathewson [Wed, 17 Jul 2019 12:00:28 +0000 (14:00 +0200)] 
Fix practracker_tests.py and practracker line counting.

The practracker_tests.py unit test file called a function by its old
name.

Also, practracker counted functions as starting one line after the
function name, and ending with the closing brace.  Now they start
with the open brace and end with the closing brace.

6 years agoAdjust log callback type to use log_domain_mask_t
Nick Mathewson [Mon, 8 Jul 2019 18:11:02 +0000 (14:11 -0400)] 
Adjust log callback type to use log_domain_mask_t

6 years agoAdd a compile-time assertion to prevent a recurrence of 31080.
Nick Mathewson [Mon, 8 Jul 2019 17:41:35 +0000 (13:41 -0400)] 
Add a compile-time assertion to prevent a recurrence of 31080.

6 years agoUse a 64-bit mask for log domains, and fix a conflict
Nick Mathewson [Mon, 8 Jul 2019 17:32:45 +0000 (13:32 -0400)] 
Use a 64-bit mask for log domains, and fix a conflict

When we added LD_MESG, we created a conflict with the LD_NO_MOCK
flag.  We now need 64 bits for log domains in order to fix this
issue.

Fixes bug 31080; bugfix on 0.4.1.1-alpha.

6 years agoMove declaration of LD_NO_MESG to make conflict more apparent.
Nick Mathewson [Mon, 8 Jul 2019 17:00:31 +0000 (13:00 -0400)] 
Move declaration of LD_NO_MESG to make conflict more apparent.

6 years agoMerge branch 'tor-github/pr/1152'
George Kadianakis [Thu, 4 Jul 2019 14:14:06 +0000 (17:14 +0300)] 
Merge branch 'tor-github/pr/1152'

6 years agotypo fix
Roger Dingledine [Wed, 3 Jul 2019 20:01:05 +0000 (16:01 -0400)] 
typo fix

6 years agoclarify a comment in the tor-exit-notice text
Roger Dingledine [Wed, 3 Jul 2019 19:56:17 +0000 (15:56 -0400)] 
clarify a comment in the tor-exit-notice text

(a relay operator in #tor-relays just now was confused and thought
that dirportfrontpage could serve multiple files, like a real webserver.)

6 years agoMake config_lines_eq() take const arguments.
Nick Mathewson [Wed, 3 Jul 2019 14:27:38 +0000 (10:27 -0400)] 
Make config_lines_eq() take const arguments.

6 years agoRevert "Add a function to append an existing line to a config line list."
Nick Mathewson [Wed, 3 Jul 2019 14:21:49 +0000 (10:21 -0400)] 
Revert "Add a function to append an existing line to a config line list."

This reverts commit 5a2ab886baaa125fe715acca8f7daf35031855aa.

6 years agoFix @file directive in var_type_def_st.h
Nick Mathewson [Wed, 3 Jul 2019 14:19:57 +0000 (10:19 -0400)] 
Fix @file directive in var_type_def_st.h

6 years agoMerge remote-tracking branch 'tor-github/pr/1136'
Nick Mathewson [Tue, 2 Jul 2019 17:33:50 +0000 (13:33 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1136'

6 years agoMerge remote-tracking branch 'tor-github/pr/1120'
Nick Mathewson [Tue, 2 Jul 2019 17:33:37 +0000 (13:33 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1120'

6 years agoEarly exit from post-merge git hook script when not merging to master
rl1987 [Tue, 2 Jul 2019 17:06:23 +0000 (20:06 +0300)] 
Early exit from post-merge git hook script when not merging to master

6 years agoMerge remote-tracking branch 'dgoulet/ticket31008_035_01'
George Kadianakis [Tue, 2 Jul 2019 10:19:40 +0000 (13:19 +0300)] 
Merge remote-tracking branch 'dgoulet/ticket31008_035_01'

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Mon, 1 Jul 2019 18:25:13 +0000 (14:25 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge branch 'maint-0.4.0' into maint-0.4.1
Nick Mathewson [Mon, 1 Jul 2019 18:25:12 +0000 (14:25 -0400)] 
Merge branch 'maint-0.4.0' into maint-0.4.1

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.5
Nick Mathewson [Mon, 1 Jul 2019 18:25:12 +0000 (14:25 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.5

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Mon, 1 Jul 2019 18:25:12 +0000 (14:25 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'chutney_ci_v4_040' into chutney_ci_v4_041
teor [Mon, 1 Jul 2019 04:36:53 +0000 (14:36 +1000)] 
Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041

6 years agoMerge branch 'chutney_ci_v4_035' into chutney_ci_v4_040
teor [Mon, 1 Jul 2019 04:36:15 +0000 (14:36 +1000)] 
Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040

This merge removes an incorrect comment about the stem version
and commit script.

6 years agoTravis: SKIP_MAKE_CHECK="yes" when running stem
teor [Mon, 1 Jul 2019 04:33:54 +0000 (14:33 +1000)] 
Travis: SKIP_MAKE_CHECK="yes" when running stem

And add some comments about stem

Part of 29280.

6 years agoMerge branch 'chutney_ci_v4_029' into chutney_ci_v4_035
teor [Mon, 1 Jul 2019 04:31:17 +0000 (14:31 +1000)] 
Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035

6 years agoTravis: remove a redundant os: linux line
teor [Mon, 1 Jul 2019 04:11:25 +0000 (14:11 +1000)] 
Travis: remove a redundant os: linux line

Linux is the first item in the os matrix, so we don't need to specify
it under matrix: include: .

Part of 29280.

6 years agoTravis: show the chutney commit and python version
teor [Mon, 1 Jul 2019 04:10:07 +0000 (14:10 +1000)] 
Travis: show the chutney commit and python version

Part of 29280.

6 years agoTravis: show chutney logs on chutney job failure
teor [Mon, 1 Jul 2019 04:05:26 +0000 (14:05 +1000)] 
Travis: show chutney logs on chutney job failure

Part of 29280.

6 years agoget rid of accidental second space
Roger Dingledine [Sun, 30 Jun 2019 02:26:00 +0000 (22:26 -0400)] 
get rid of accidental second space

6 years agoCoverity: different implementation for csiphash
Nick Mathewson [Fri, 28 Jun 2019 15:57:36 +0000 (11:57 -0400)] 
Coverity: different implementation for csiphash

Coverity has had trouble figuring out our csiphash implementation,
and has given spurious warnings about its behavior.

This patch changes the csiphash implementation when coverity is in
use, so that coverity can figure out that we are not about to read
beyond the provided input.

Closes ticket 31025.

6 years agobegin_cell_parse(): Add an assertion to please coverity.
Nick Mathewson [Fri, 28 Jun 2019 15:27:59 +0000 (11:27 -0400)] 
begin_cell_parse(): Add an assertion to please coverity.

Coverity doesn't understand that if begin_cell_parse() returns 0 and
sets is_begindir to 0, its address field will always be set.

Fixes bug 30126; bugfix on 0.2.4.7-alpha; Fixes CID 1447296.

6 years agochanges: file for 28795
teor [Fri, 28 Jun 2019 11:37:37 +0000 (21:37 +1000)] 
changes: file for 28795

Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc
in December 2018 (of which ~122 were still functional), with a
list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
in June 2019.

Closes ticket 28795.

Note that we created extra lists from DE and US, but they didn't add
any more fallbacks when we tried to merge them.

6 years agofallback: apply the second fallback list from 2019
teor [Fri, 28 Jun 2019 11:16:50 +0000 (21:16 +1000)] 
fallback: apply the second fallback list from 2019

Update the fallback directory mirrors by merging the current list with:
fallback_dirs_2019-06-28-08-58-39_AU_f0437a39ddbc8459.inc

Part of 28795, see that ticket for logs.

6 years agofallback: apply the first fallback list from 2019
teor [Fri, 28 Jun 2019 11:04:20 +0000 (21:04 +1000)] 
fallback: apply the first fallback list from 2019

Update the fallback directory mirrors by replacing the old list with:
fallback_dirs_2019-06-25-11-49-10_AU_a37adb956fbb5cd2.inc

Part of 28795, see that ticket for logs.

6 years agoman: Fix -help typo to --help
David Goulet [Thu, 27 Jun 2019 18:47:11 +0000 (14:47 -0400)] 
man: Fix -help typo to --help

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agoMerge branch 'tor-github/pr/1129'
David Goulet [Thu, 27 Jun 2019 14:19:45 +0000 (10:19 -0400)] 
Merge branch 'tor-github/pr/1129'

6 years agodoc: update the man page entries for DirAuthority and FallbackDir
teor [Mon, 24 Jun 2019 03:50:26 +0000 (13:50 +1000)] 
doc: update the man page entries for DirAuthority and FallbackDir

Improve the documentation for the DirAuthority and FallbackDir torrc
options.

Closes ticket 30955.

6 years agoMerge branch 'tor-github/pr/1140'
David Goulet [Wed, 26 Jun 2019 15:39:33 +0000 (11:39 -0400)] 
Merge branch 'tor-github/pr/1140'

6 years agoMerge branch 'maint-0.4.1'
Nick Mathewson [Wed, 26 Jun 2019 14:06:02 +0000 (10:06 -0400)] 
Merge branch 'maint-0.4.1'

6 years agoMerge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1
Nick Mathewson [Wed, 26 Jun 2019 14:05:51 +0000 (10:05 -0400)] 
Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1

6 years agoMerge branch 'bug30721_squashed'
Nick Mathewson [Wed, 26 Jun 2019 13:57:20 +0000 (09:57 -0400)] 
Merge branch 'bug30721_squashed'

6 years agotest/addr: test that tor_addr_port_lookup() handles IP addresses and ports
teor [Fri, 14 Jun 2019 01:06:21 +0000 (11:06 +1000)] 
test/addr: test that tor_addr_port_lookup() handles IP addresses and ports

And that it does something sensible with host and host:port.

Also reorder the tests into valid, invalid, and ambiguous.
And add some missing cases.

Note: tor_addr_port_lookup() handles ip, ip:port, host, and host:port.

Tests for 30721.

6 years agotest/addr: test that tor_addr_lookup() handles IP addresses
teor [Thu, 13 Jun 2019 14:49:45 +0000 (00:49 +1000)] 
test/addr: test that tor_addr_lookup() handles IP addresses

And that it fails on IP:port and host:port, and does something sensible with
host.

Tests for 30721.