Commit Graph

27190 Commits

Author SHA1 Message Date
Nick Mathewson 20f802ea3c Add an option to disable signal handler installation.
Closes ticket 24588.
2017-12-15 12:48:29 -05:00
Nick Mathewson fdd5734875 Remove the unused is_parent==0 option from handle_signals. 2017-12-15 12:45:30 -05:00
Nick Mathewson a61c36d53a indentation fix 2017-12-15 12:37:15 -05:00
Nick Mathewson 519c6ba26c Merge remote-tracking branch 'isis/bug24612' 2017-12-15 10:59:57 -05:00
Nick Mathewson db4873c46d Merge branch 'maint-0.3.2'
"ours" merge to avoid version bump
2017-12-14 14:12:41 -05:00
Nick Mathewson 5c4da2cacd bump to 0.3.2.7-rc-dev 2017-12-14 14:12:31 -05:00
Nick Mathewson d7aab158d0 forward-port the 0.3.2.7-rc changelog 2017-12-14 14:07:04 -05:00
Nick Mathewson 102b4f3a92 remove changes files that will appear in 0.3.2.7-rc 2017-12-13 12:08:52 -05:00
Nick Mathewson 9b71469773 Merge branch 'maint-0.3.2' 2017-12-13 12:07:46 -05:00
Nick Mathewson ca8e9813bf vim sometimes makes swo tempfiles 2017-12-13 12:07:45 -05:00
Nick Mathewson 1fb3d37c08 Merge branch 'maint-0.3.2'
"ours" merge to avoid version bump.
2017-12-13 12:06:43 -05:00
Nick Mathewson 93b3c4b844 update to 0.3.2.7-rc 2017-12-13 12:06:37 -05:00
Nick Mathewson 8441189b3c Changes file for 24374, merged earlier. 2017-12-13 09:50:57 -05:00
Isis Lovecruft c7dc65e033 build: Add pretty printing of results of rust autoconf checks.
* ADDS several `AC_MSG_RESULT`s which print the result of our checks
   for our rust dependencies and a check for a suitable rustc compiler
   version.
 * FIXES #24612: https://bugs.torproject.org/24612
2017-12-13 02:27:02 +00:00
Nick Mathewson 426110dfa2 Merge branch 'maint-0.3.2' 2017-12-12 19:46:53 -05:00
Nick Mathewson 15b41fa6ae Make sandbox.c compile when libseccomp-dev is installed on arm64
Fixes ticket 24424.  Patch from weasel.
2017-12-12 19:46:03 -05:00
Nick Mathewson 9abef516f6 Merge branch 'maint-0.3.2' 2017-12-12 19:27:14 -05:00
Nick Mathewson bf89b08930 Merge branch 'bug24367_032_squashed' into maint-0.3.2 2017-12-12 19:17:38 -05:00
teor 19a4abf2a9 Make sure bridges are definitely running before delaying directory fetches
Retry directory downloads when we get our first bridge descriptor
during bootstrap or while reconnecting to the network. Keep retrying
every time we get a bridge descriptor, until we have a reachable bridge.

Stop delaying bridge descriptor fetches when we have cached bridge
descriptors. Instead, only delay bridge descriptor fetches when we
have at least one reachable bridge.

Fixes bug 24367; bugfix on 0.2.0.3-alpha.
2017-12-12 19:17:25 -05:00
teor 6b5c70670b Simplify some conditionals in circuit_get_open_circ_or_launch()
When entry_list_is_constrained() is true, guards_retry_optimistic()
always returns true.

When entry_list_is_constrained() is false,
options->UseBridges is always false,
therefore !options->UseBridges is always true,
therefore (!options->UseBridges || ...) is always true.

Cleanup after #24367.
2017-12-12 19:17:25 -05:00
Nick Mathewson 13455c0f1a Merge branch 'maint-0.3.2' 2017-12-12 09:32:29 -05:00
Nick Mathewson cf5ab5934e Merge remote-tracking branch 'dgoulet/bug24595_032_02' into maint-0.3.2 2017-12-12 09:32:24 -05:00
Nick Mathewson e622f208a3 Merge remote-tracking branch 'teor/bug23827-v2' 2017-12-12 09:27:03 -05:00
George Kadianakis b6fd78ea30 hs-v3: Don't lookup an intro point while cleaning it up
Commit e80893e51b made tor call
hs_service_intro_circ_has_closed() when we mark for close a circuit.

When we cleanup intro points, we iterate over the descriptor's map of intro
points and we can possibly mark for close a circuit. This was problematic
because we would MAP_DEL_CURRENT() the intro point then free it and finally
mark for close the circuit which would lookup the intro point that we just
free in the map we are iterating over.

This can't be done and leads to a use-after-free because the intro point will
be returned successfully due to the fact that we are still in the loop
iterating. In other words, MAP_DEL_CURRENT() followed by a digest256map_get()
of the same object should never be done in the same loop.

Fixes #24595

Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-12-12 09:21:25 -05:00
Nick Mathewson 9c604e2bbb Fix compilation: logfile_is_external() must accept const* 2017-12-12 09:21:12 -05:00
Nick Mathewson 6c5a73f87a Merge remote-tracking branch 'ahf-oniongit/bugs/24362' 2017-12-12 09:18:52 -05:00
Nick Mathewson 21ee765df0 Merge remote-tracking branch 'teor/log24558' 2017-12-12 09:16:12 -05:00
Nick Mathewson 4c54021baf Merge branch 'maint-0.3.1' into maint-0.3.2 2017-12-12 09:13:12 -05:00
Nick Mathewson 644ec835d5 Merge branch 'maint-0.3.2' 2017-12-12 09:13:12 -05:00
Nick Mathewson 31ce03a2b9 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-12-12 09:13:12 -05:00
Nick Mathewson d3b7a2bd27 rename changes file 2017-12-12 09:13:05 -05:00
Nick Mathewson 632d6cbc43 Merge remote-tracking branch 'teor/doc24596' 2017-12-12 09:07:49 -05:00
teor 2ff706ba02 Make configure log messages less confusing during static builds
Closes #24558.
2017-12-12 12:43:53 +11:00
teor 7b59199663 Fix a typo in CodingStandards.md
Closes #24596.
2017-12-12 12:32:50 +11:00
Alexander Færøy cbc465a3d1 Simplify explicit conditional checks into an inlined function.
This patch lifts the check for whether a given log file (`logfile_t`) is
an "external logfile" (handled by an external logging system such as
syslog, android's logging subsystem, or as an external C callback
function) into a function on its own.

See: https://bugs.torproject.org/24362
2017-12-12 01:17:57 +00:00
Nick Mathewson 4593f5a6e1 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-12-11 16:56:31 -05:00
Nick Mathewson cdee62da9e Merge branch 'maint-0.3.0' into maint-0.3.1 2017-12-11 16:56:31 -05:00
Nick Mathewson da38904efb Merge branch 'maint-0.2.9' into maint-0.3.0 2017-12-11 16:56:31 -05:00
Nick Mathewson a6587e9070 Merge branch 'maint-0.3.2' 2017-12-11 16:56:31 -05:00
Nick Mathewson eecfed0cd2 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-12-11 16:56:31 -05:00
Nick Mathewson f7151387d9 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-12-11 16:56:31 -05:00
Nick Mathewson 1deda2106b Merge branch 'bug24167_025' into maint-0.2.5 2017-12-11 16:56:28 -05:00
Nick Mathewson 43fb8fc5cb Merge branch 'maint-0.3.1' into maint-0.3.2 2017-12-11 16:54:14 -05:00
Nick Mathewson 422ff8f922 Merge branch 'maint-0.3.2' 2017-12-11 16:54:14 -05:00
Nick Mathewson 04524443d0 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-12-11 16:54:14 -05:00
Nick Mathewson 2ea573ece8 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-12-11 16:54:14 -05:00
Nick Mathewson eaaa1108a3 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-12-11 16:54:14 -05:00
Nick Mathewson bc1ea4f470 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-12-11 16:54:11 -05:00
Nick Mathewson f5d4bdf305 Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5 2017-12-11 16:53:02 -05:00
Nick Mathewson e553bf3ce4 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-12-11 16:51:58 -05:00