Nick Mathewson
fc6c0b46fb
Merge branch 'bug23690_additional_032'
2017-09-29 10:29:40 -04:00
Nick Mathewson
b0ddaac074
Make some assertions nonfatal to help prevent bug23690 recurrence.
2017-09-29 10:29:33 -04:00
Nick Mathewson
8ccefa7b7a
Merge branch 'bug23690_028'
2017-09-29 10:28:33 -04:00
Nick Mathewson
f7222e6d8c
Clear outbuf_flushlen when we clear a connection's outbuf
...
When we added single_conn_free_bytes(), we cleared the outbuf on a
connection without setting outbuf_flushlen() to 0. This could cause
an assertion failure later on in flush_buf().
Fixes bug 23690; bugfix on 0.2.6.1-alpha.
2017-09-29 10:00:14 -04:00
Nick Mathewson
4110745017
Merge branch 'maint-0.3.1'
2017-09-28 18:54:18 -04:00
Alexander Færøy
8d6940814a
Better error handling when trying to compress/decompress into empty buffer.
...
This patch ensures that we return TOR_COMPRESS_BUFFER_FULL in case we
have a input bytes left to process, but are out of output buffer or in
case we need to finish where the compression implementation might need
to write an epilogue.
See: https://bugs.torproject.org/23551
2017-09-28 20:17:41 +02:00
Nick Mathewson
b8b4143517
fix the changes file
2017-09-26 14:51:35 -04:00
David Goulet
40ab25db62
hs-v3: Don't non fatal assert if we can't get the intro extend info
...
Fixes #23159 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-26 13:55:51 -04:00
Nick Mathewson
2de588ffdb
Merge branch 'ticket23602_029'
2017-09-26 13:02:26 -04:00
Nick Mathewson
6beeb10070
Merge branch 'typecheck4'
2017-09-26 12:26:01 -04:00
Nick Mathewson
8f0dffe329
changes file for my confparse typechecking fun
2017-09-26 12:25:34 -04:00
Nick Mathewson
ce4ac7aace
add changes file for 23645
2017-09-26 08:57:10 -04:00
Nick Mathewson
45530ed729
Merge branch 'bug22109'
2017-09-25 14:32:04 -04:00
Nick Mathewson
90e8d1f58f
Merge branch 'bug23539_032_01_squashed'
2017-09-25 11:12:56 -04:00
David Goulet
ef2a449cce
sched: Make KISTSchedRunInterval non negative
...
Fixes #23539 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-25 11:11:30 -04:00
Nick Mathewson
f82f1f4b8c
fix changes file
2017-09-25 09:29:11 -04:00
Nick Mathewson
777e828ef3
Merge remote-tracking branch 'asn/ticket23420_032_01'
2017-09-25 09:24:36 -04:00
Nick Mathewson
122eab78d9
Merge remote-tracking branch 'pastly/bug23552_032_03'
2017-09-22 09:54:41 -04:00
Nick Mathewson
91467e04b1
Merge branch 'bug22805_v2_squashed'
2017-09-22 08:58:17 -04:00
Nick Mathewson
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
Nick Mathewson
6a75a6fd9a
changes file for bug22805
2017-09-22 08:55:53 -04:00
Matt Traudt
22699e3f16
sched: only log when scheduler type changes
...
Closes 23552. Thanks dgoulet for original impl
2017-09-22 08:51:22 -04:00
Nick Mathewson
00d7b60557
Merge branch 'bug21800'
2017-09-21 17:39:54 -04:00
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
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
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
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
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
564ff506ea
When detecting OpenSSL, look for 1.0.1, and in homebrew location
...
Previously we would detect the system openssl on OSX, and then fail
to use it, since we required Open 1.0.1 or later. That's silly!
Instead of looking for RAND_add(), look for TLSv1_1_method(): it was
introduced in 1.0.1, and is also present in LibreSSL.
Also, add the hombebrew path to our search path here.
Fixes bug 23602; bugfix on 0.2.7.2-alpha.
2017-09-20 16:07:19 -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
Nick Mathewson
2998350122
Merge branch 'bug23080'
2017-09-20 12:12:02 -04:00
Nick Mathewson
f9155ff416
Unit test to make sure that our platform string is parseable
...
Closes 22109.
2017-09-20 10:10: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
2c93be80d9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-20 08:32:55 -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
