Nick Mathewson
6203047e1f
check-changes fix
2017-09-21 17:34:47 -04:00
Nick Mathewson
bb9b8e65bb
Merge remote-tracking branch 'pastly/bug23581_032_03'
2017-09-21 17:33:10 -04:00
Nick Mathewson
9af06bdd1e
Whoops; only run lintchanges when usepython
2017-09-21 17:32:17 -04:00
Nick Mathewson
2032d7ca6f
Update CodingStandards.md for changes-file stuff
...
'check-changes' is now part of "make check", and must pass.
2017-09-21 16:39:49 -04:00
Nick Mathewson
c3f126f753
Whoops -- put a changes file in the wrong place :(
2017-09-21 16:29:15 -04:00
Nick Mathewson
f118c0216b
Fix warning in bug23610
2017-09-21 16:27:09 -04:00
Nick Mathewson
68df19049b
Merge branch 'ticket23564_squashed'
2017-09-21 16:25:30 -04:00
Nick Mathewson
3c04c8317f
Make check-spaces part of the standard "make check" process
...
To do this, we had to make sure it passes when the changes directory
is empty. I also tried to improve the quality of the output, and
fix some false-positive cases. Let's see how this goes!
Closes ticket 23564.
2017-09-21 16:25:24 -04:00
Nick Mathewson
b2f3b3b7eb
Merge remote-tracking branch 'dgoulet/ticket23303_032_01'
2017-09-21 14:43:05 -04:00
Nick Mathewson
e1d8a4bd72
Merge remote-tracking branch 'catalyst-oniongit/bug23611'
2017-09-21 14:42:03 -04:00
Nick Mathewson
c92ecac8bb
Merge branch 'maint-0.3.1'
2017-09-21 14:39:17 -04:00
David Goulet
7f3dc8327a
hs: Avoid possible double circuit close on error
...
Fixes #23610
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-21 14:38:43 -04:00
Taylor Yu
87faed921e
Remove wrong config parameter mention from manpage
...
Don't refer to the obsolete (and misspelled)
UseEntryGuardsAsDirectoryGuards config parameter in the manpage.
2017-09-21 13:31:54 -05:00
David Goulet
1749e07891
hs: Improve comments for when we change timestamps
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-21 14:24:36 -04:00
David Goulet
c20d4db7bf
sched: Hard exit if we can't select a scheduler
...
Fixes #23581
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-21 14:18:42 -04:00
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
Nick Mathewson
ac8e26a415
Use correct name for authtype 3 in a comment.
2017-09-20 15:46:21 -04: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
David Goulet
317dabc57f
circuit: Log n_circ_id and global identifier
...
When we can, log the n circuit id and global identifier for origin circuit.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-20 12:52:53 -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
Andreas Stieger
427c2cc9e8
in zstd compression, fix 32 bit build
...
format '%lu' expects argument of type 'long unsigned int', but argument ... has type 'size_t'
Closes ticket 23568.
2017-09-20 09:43:08 -04:00
Nick Mathewson
427ae164f3
Fix a comment that misunderstood is_canonical
...
is_canonical doesn't mean "am I connected to the one true address of
this relay"; it means "does this relay tell me that the address I'm
connected to belong to it." The point is to prevent TCP-based MITM,
not to prevent the relay from multi-homing.
Related to 22890.
2017-09-20 09:41:01 -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
9e0587f806
Merge remote-tracking branch 'dgoulet/ticket23305_032_01'
2017-09-20 08:36:11 -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
Matt Traudt
4a3b61a5b3
sched: reorder code to fit comment bodies; comment typos
...
Closes 23560
2017-09-19 20:13:28 -04:00
Roger Dingledine
1c956ccd5f
fix typos/etc found while starting to look at scheduler
2017-09-19 19:55:57 -04: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
ac73913d40
Merge branch 'bug23583_029'
2017-09-19 14:12:29 -04:00
Nick Mathewson
10ea3343b5
Avoid integer error in TEST_BITOPS tests
...
If "1" is not 64 bits wide already, then "1 << i" will not actually
work.
This bug only affects the TEST_BITOPS code, and shouldn't matter for
the actual use of the timeout code (except if/when it causes this
test to fail).
Reported by dcb314@hotmail.com . Fix for bug 23583. Not adding a
changes file, since this code is never compiled into Tor.
2017-09-19 13:58:35 -04:00
Nick Mathewson
7581ac7094
Merge remote-tracking branch 'hiro/gitlab-ci'
2017-09-19 13:43:53 -04:00
Nick Mathewson
a2caa466ee
Merge branch 'ticket21405'
2017-09-19 13:36:43 -04:00
Nick Mathewson
29e98d16d2
note the format we expect for IPv6
2017-09-19 13:19:45 -04:00
Nick Mathewson
7fcae5bffa
Merge branch 'maint-0.3.1'
2017-09-19 13:08:59 -04:00
Nick Mathewson
346066a42e
add rust registry to gitignore
2017-09-19 13:08:56 -04:00
Nick Mathewson
3bb6028a8e
Merge branch 'ticket18891'
2017-09-19 13:07:01 -04:00
