f82f1f4b8c
fix changes file
2017-09-25 09:29:11 -04:00
777e828ef3
Merge remote-tracking branch 'asn/ticket23420_032_01'
2017-09-25 09:24:36 -04:00
03b3f5486a
prop224: Add test for parsing RENDEZVOUS1 cell.
...
Just making sure that added padding does not screw up cell parsing.
2017-09-25 15:00:06 +03:00
a1f31c0671
fix typo
2017-09-22 17:26:29 -04:00
cbea334d6b
Mention even more about changes files in doc/HACKING
2017-09-22 15:14:36 -04:00
22e2c3bf7d
Fix check-spaces and a weird copyright.
2017-09-22 12:20:26 -04:00
230a336798
Use setup_full_capture_of_logs for 21800
...
setup_capture_of_logs() doesn't actually suppress warnings :p
2017-09-22 10:22:47 -04:00
ac3fdb74c2
Remove unused chosen_scheduler_type variable.
2017-09-22 09:56:54 -04:00
122eab78d9
Merge remote-tracking branch 'pastly/bug23552_032_03'
2017-09-22 09:54:41 -04:00
cce936aee0
Merge branch 'maint-0.3.1'
2017-09-22 09:09:17 -04:00
9b02641812
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-22 09:09:17 -04:00
dc5c9af6c3
hs: Avoid possible double circuit close on error
...
Fixes #23610
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-09-22 09:09:13 -04:00
91467e04b1
Merge branch 'bug22805_v2_squashed'
2017-09-22 08:58:17 -04:00
95a7e7e925
Stop using CREATE_FAST as a signifier of clienthood.
...
Relays send it, and we may as well let them. Part of our fix for
22805.
2017-09-22 08:57:45 -04:00
6a75a6fd9a
changes file for bug22805
2017-09-22 08:55:53 -04:00
ceb49c1c5f
Use channel_is_client() accessor in channelpadding.c.
...
Also, allow channel_is_client() to take a const channel.
2017-09-22 08:55:53 -04:00
d1e0e486e9
Stop clearing the is_client flag on channel directly
2017-09-22 08:55:53 -04:00
66aff2d8f3
Remove or_circuit_t.is_first_hop; use channel_is_client() instead
...
The is_first_hop field should have been called used_create_fast,
but everywhere that we wanted to check it, we should have been
checking channel_is_client() instead.
2017-09-22 08:55:53 -04:00
88b317ef28
sched: move code to respect comments
...
The diff is confusing, but were two static scheduler functions that
needed moving to static comment block.
No code change. Thanks dgoulet for original commit
2017-09-22 08:52:27 -04:00
22699e3f16
sched: only log when scheduler type changes
...
Closes 23552. Thanks dgoulet for original impl
2017-09-22 08:51:22 -04:00
512c57cff9
test_util: capture the log in the correct place.
2017-09-22 08:51:03 -04:00
00d7b60557
Merge branch 'bug21800'
2017-09-21 17:39:54 -04:00
6203047e1f
check-changes fix
2017-09-21 17:34:47 -04:00
bb9b8e65bb
Merge remote-tracking branch 'pastly/bug23581_032_03'
2017-09-21 17:33:10 -04:00
9af06bdd1e
Whoops; only run lintchanges when usepython
2017-09-21 17:32:17 -04:00
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
c3f126f753
Whoops -- put a changes file in the wrong place :(
2017-09-21 16:29:15 -04:00
f118c0216b
Fix warning in bug23610
2017-09-21 16:27:09 -04:00
68df19049b
Merge branch 'ticket23564_squashed'
2017-09-21 16:25:30 -04:00
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
33d44dc4ac
Capture "Result does not fit in tor_timegm()" warnings in util tests
...
Fixes bug 21800; bugfix on 0.2.9.x
2017-09-21 15:32:16 -04:00
b2f3b3b7eb
Merge remote-tracking branch 'dgoulet/ticket23303_032_01'
2017-09-21 14:43:05 -04:00
e1d8a4bd72
Merge remote-tracking branch 'catalyst-oniongit/bug23611'
2017-09-21 14:42:03 -04:00
c92ecac8bb
Merge branch 'maint-0.3.1'
2017-09-21 14:39:17 -04:00
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
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
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
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
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
4c7a89a226
Merge remote-tracking branch 'catalyst-oniongit/bug23607'
2017-09-21 10:58:06 -04:00
0f6bbbc74b
lintchanges fix
2017-09-21 10:42:40 -04:00
c7b7cf8e18
Merge branch 'maint-0.3.1'
2017-09-21 10:39:10 -04:00
d70a793cfc
Bug 23608: Mock time for all channelpadding tests.
2017-09-21 10:36:57 -04:00
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
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
ac8e26a415
Use correct name for authtype 3 in a comment.
2017-09-20 15:46:21 -04:00
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
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
2998350122
Merge branch 'bug23080'
2017-09-20 12:12:02 -04:00
ff0aabc35d
Merge branch 'maint-0.3.1'
2017-09-20 09:45:07 -04:00
Nick Mathewson
George Kadianakis
Roger Dingledine
David Goulet
Matt Traudt
Taylor Yu
Mike Perry