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
122eab78d9
Merge remote-tracking branch 'pastly/bug23552_032_03'
2017-09-22 09:54:41 -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
22699e3f16
sched: only log when scheduler type changes
...
Closes 23552. Thanks dgoulet for original impl
2017-09-22 08:51:22 -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
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
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
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
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
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
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
1a26c6be8b
changes file for bug23568
2017-09-20 09:45:03 -04:00
c4e8548c59
Warn on ExtORPort USERADDR that is missing or 0.
...
Diagnoses violations on #23080 .
2017-09-20 08:50:49 -04:00
654820ec1c
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-20 08:32:55 -04:00
a8f4f5742e
Merge branch 'maint-0.3.1'
2017-09-20 08:32:55 -04:00
746410fb24
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-20 08:32:55 -04:00
2c93be80d9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-20 08:32:55 -04:00
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
6628c95e54
Merge remote-tracking branch 'pastly2/bug23566_032_01'
2017-09-19 19:35:46 -04:00
951b9f1fa5
tests: fix transproxy tests on BSD systems
2017-09-19 19:20:55 -04:00
a8c54ce581
sched: Allow the new sched to react to new cons
2017-09-19 19:07:48 -04:00
a2caa466ee
Merge branch 'ticket21405'
2017-09-19 13:36:43 -04:00
3bb6028a8e
Merge branch 'ticket18891'
2017-09-19 13:07:01 -04:00
6d8f98646b
Clarify that Address is an IPv4 option only.
2017-09-19 13:06:54 -04:00
5f08eb6e57
Merge branch 'ticket18736'
2017-09-19 13:03:20 -04:00
6010f9420a
Clarify the term "address" in the manpage
...
Closes 21405.
2017-09-19 10:22:35 -04:00
f395f41868
fix a lintchanges problem
2017-09-19 10:03:32 -04:00
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
a3f5a24669
hs: Pad RENDEZVOUS1 v3 cell to match length of v2
...
RENDEZVOUS1 cell is 84 bytes long in v3 and 168 bytes long in v2 so this
commit pads with random bytes the v3 cells up to 168 bytes so they all look
alike at the rendezvous point.
Closes #23420
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-09-19 09:13:28 -04:00
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
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
94a88eaa45
Merge remote-tracking branch 'public/ticket19704'
2017-09-18 15:02:16 -04:00
0bd62c1d92
Start on a changelog for 0.3.2.1-alpha: sortchanges and formatchangelog
2017-09-18 10:32:03 -04:00
Nick Mathewson
Matt Traudt
David Goulet
Taylor Yu
Mike Perry
teor