David Goulet
6045bdd4a0
hs: Avoid possible double circuit close on error
...
Fixes #23610
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-21 13:13:53 -04:00
Nick Mathewson
4c7a89a226
Merge remote-tracking branch 'catalyst-oniongit/bug23607'
2017-09-21 10:58:06 -04:00
Nick Mathewson
0f6bbbc74b
lintchanges fix
2017-09-21 10:42:40 -04:00
Nick Mathewson
c7b7cf8e18
Merge branch 'maint-0.3.1'
2017-09-21 10:39:10 -04:00
Mike Perry
d70a793cfc
Bug 23608: Mock time for all channelpadding tests.
2017-09-21 10:36:57 -04:00
Taylor Yu
ad814cad41
Avoid assertion failure for state file clock skew
...
The clock_skew_warning() refactoring allowed calls from
or_state_load() to control_event_bootstrap_problem() to occur prior
bootstrap phase 0, causing an assertion failure. Initialize the
bootstrap status prior to calling clock_skew_warning() from
or_state_load().
2017-09-20 18:54:37 -05:00
Taylor Yu
1c017edac3
Use correct sign for state file clock skew
...
or_state_load() was using an incorrect sign convention when calling
clock_skew_warning() to warn about state file clock skew. This caused
the wording of the warning to be incorrect about the direction of the
skew.
2017-09-20 18:50:39 -05:00
David Goulet
9b4513c5d1
hs: Log the intro point when we clean it up
...
When we remove an intro point from the service list, log info about it and
some useful data.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-20 13:08:16 -04:00
Nick Mathewson
2998350122
Merge branch 'bug23080'
2017-09-20 12:12:02 -04:00
Nick Mathewson
ff0aabc35d
Merge branch 'maint-0.3.1'
2017-09-20 09:45:07 -04:00
Nick Mathewson
1a26c6be8b
changes file for bug23568
2017-09-20 09:45:03 -04:00
Nick Mathewson
c4e8548c59
Warn on ExtORPort USERADDR that is missing or 0.
...
Diagnoses violations on #23080 .
2017-09-20 08:50:49 -04:00
Nick Mathewson
654820ec1c
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-20 08:32:55 -04:00
Nick Mathewson
a8f4f5742e
Merge branch 'maint-0.3.1'
2017-09-20 08:32:55 -04:00
Nick Mathewson
746410fb24
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-20 08:32:55 -04:00
Nick Mathewson
2c93be80d9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-20 08:32:55 -04:00
teor
8e52c46581
Remove longclaw's IPv6 address, as it will soon change
...
Authority IPv6 addresses were originally added in 0.2.8.1-alpha.
This leaves 3/8 directory authorities with IPv6 addresses, but there
are also 52 fallback directory mirrors with IPv6 addresses.
Resolves 19760.
2017-09-20 14:48:53 +10:00
Nick Mathewson
6628c95e54
Merge remote-tracking branch 'pastly2/bug23566_032_01'
2017-09-19 19:35:46 -04:00
Matt Traudt
951b9f1fa5
tests: fix transproxy tests on BSD systems
2017-09-19 19:20:55 -04:00
Matt Traudt
a8c54ce581
sched: Allow the new sched to react to new cons
2017-09-19 19:07:48 -04:00
Nick Mathewson
a2caa466ee
Merge branch 'ticket21405'
2017-09-19 13:36:43 -04:00
Nick Mathewson
3bb6028a8e
Merge branch 'ticket18891'
2017-09-19 13:07:01 -04:00
Nick Mathewson
6d8f98646b
Clarify that Address is an IPv4 option only.
2017-09-19 13:06:54 -04:00
Nick Mathewson
5f08eb6e57
Merge branch 'ticket18736'
2017-09-19 13:03:20 -04:00
Nick Mathewson
6010f9420a
Clarify the term "address" in the manpage
...
Closes 21405.
2017-09-19 10:22:35 -04:00
Nick Mathewson
f395f41868
fix a lintchanges problem
2017-09-19 10:03:32 -04:00
Nick Mathewson
b74a1c77a4
Document that .onion subdomains are ignored by clients
...
addr-spec.txt also explains this, but we should get it into the
manpage too.
Closes ticket #18736 .
2017-09-19 09:26:54 -04:00
David Goulet
6f313edc8a
doc: Add version 3 to HiddenServiceVersion man page entry
...
Fixes #23580
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-19 08:39:43 -04:00
teor
e77ece3b31
Avoid a compilation warning on macOS in scheduler_ev_add()
...
This warning is caused by a different tv_usec data type on macOS
compared to the system on which the patch was developed.
Fixes 23575 on 0.3.2.1-alpha.
2017-09-19 16:32:47 +10:00
Nick Mathewson
94a88eaa45
Merge remote-tracking branch 'public/ticket19704'
2017-09-18 15:02:16 -04:00
Nick Mathewson
0bd62c1d92
Start on a changelog for 0.3.2.1-alpha: sortchanges and formatchangelog
2017-09-18 10:32:03 -04:00
Nick Mathewson
523188afdb
Use the lintChanges script to fix style issues in changes entries
2017-09-18 10:24:03 -04:00
Nick Mathewson
365bb6356a
remove changes files for items that appeared in 0.3.17
2017-09-18 10:12:30 -04:00
Nick Mathewson
c7d0096f9d
Merge branch 'maint-0.3.1'
2017-09-18 09:42:30 -04:00
Nick Mathewson
23c4592ee9
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-18 09:40:40 -04:00
Nick Mathewson
314652dc16
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-18 09:39:46 -04:00
Nick Mathewson
09ea89764a
Fix log-uninitialized-stack bug in rend_service_intro_established.
...
Fixes bug 23490; bugfix on 0.2.7.2-alpha.
TROVE-2017-008
CVE-2017-0380
2017-09-18 09:32:41 -04:00
Nick Mathewson
4a2cbea6ce
Fix log-uninitialized-stack bug in rend_service_intro_established.
...
Fixes bug 23490; bugfix on 0.2.7.2-alpha.
TROVE-2017-008
CVE-2017-0380
2017-09-18 09:27:07 -04:00
Nick Mathewson
639766dbc3
Merge branch 'maint-0.3.1'
...
Resolve conflict with 23532 code.
2017-09-15 14:40:35 -04:00
Nick Mathewson
9201e4c74b
Merge branch 'bug23487_029'
2017-09-15 14:27:58 -04:00
Nick Mathewson
37302e64a4
Merge branch 'remove_allow_dotexit_v2'
2017-09-15 12:10:47 -04:00
Nick Mathewson
f02fd6c3af
Remove AllowDotExit.
...
It's been deprecated since 0.2.9.2-alpha. Closes ticket 23426.
2017-09-15 12:09:33 -04:00
Nick Mathewson
0f4f40b70f
Merge remote-tracking branch 'dgoulet/ticket12541_032_02'
2017-09-15 12:00:50 -04:00
Nick Mathewson
962b0b849b
Merge remote-tracking branch 'dgoulet/ticket19254_032_01'
2017-09-15 11:52:10 -04:00
Matt Traudt
47390d1c9e
fixup! sched: add changes file (spaces)
2017-09-15 11:40:59 -04:00
Matt Traudt
63204be48f
sched: add changes file
2017-09-15 11:40:59 -04:00
Nick Mathewson
e88fb4f4f8
Merge remote-tracking branch 'catalyst-oniongit/bug23532'
2017-09-15 11:17:18 -04:00
Taylor Yu
e31a7be161
Make NETINFO clock skew detection work on clients
...
An unnecessary routerlist check in the NETINFO clock skew detection in
channel_tls_process_netinfo_cell() was preventing clients from
reporting NETINFO clock skew to controllers.
2017-09-15 09:49:53 -05:00
Nick Mathewson
e05414d241
Fix several places where md-using relays would get wrong behavior.
...
This patch replaces a few calls to router_get_by_id_digest ("do we
have a routerinfo?") with connection_or_digest_is_known_relay ("do
we know this relay to be in the consensus, or have been there some
time recently?").
Found while doing the 21585 audit; fixes bug 23533. Bugfix on
0.3.0.1-alpha.
2017-09-15 09:35:59 -04:00
Nick Mathewson
c4c4d03412
Merge remote-tracking branch 'asn/bug23531'
2017-09-15 08:16:20 -04:00