torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,899 Commits 53 Branches 631 Tags
c2b64ad0968f040e2b5ecb426d3520a02acb5cc7
Commit Graph
26899 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson c2b64ad096 Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-20 12:15:24 -05:00
Nick Mathewson 7e45720cf4 Merge branch 'maint-0.3.1' into maint-0.3.2 2017-12-20 12:15:24 -05:00
Nick Mathewson 5e92646715 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-12-20 12:15:24 -05:00
Nick Mathewson 08ed0d7930 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-12-20 12:15:24 -05:00
Nick Mathewson c604a76a53 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-12-20 12:15:23 -05:00
Nick Mathewson 877dd1d6c8 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-12-20 12:15:23 -05:00
Karsten Loesing 428f8a375b Update geoip and geoip6 to the December 6 2017 database. 2017-12-20 17:36:29 +01:00
Nick Mathewson 748f0abc2d Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-20 11:19:23 -05:00
Nick Mathewson 565ec6100f Merge branch 'stack_again_032' into maint-0.3.2 2017-12-20 11:19:18 -05:00
Nick Mathewson 2824413f40 Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-20 10:39:38 -05:00
Nick Mathewson 0a1b1430c8 Update the unit tests to reflect the change of 24425 2017-12-20 10:39:19 -05:00
Nick Mathewson 64c88c7199 Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-20 09:59:51 -05:00
Nick Mathewson fc33caadae Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2 2017-12-20 09:59:06 -05:00
Nick Mathewson 4f8a0ed62d Partial revert of 2b48b5363f -- didn't mean to commit this 
yet
 2017-12-14 15:44:56 -05:00
Nick Mathewson 0f105d69fc Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-14 14:12:49 -05:00
Nick Mathewson 5c4da2cacd bump to 0.3.2.7-rc-dev 2017-12-14 14:12:31 -05:00
Nick Mathewson 2b48b5363f whoops, pick a date 2017-12-14 14:05:51 -05:00
Nick Mathewson 304e2151ac edit changelog a bit tor-0.3.2.7-rc 2017-12-13 12:17:34 -05:00
Nick Mathewson 6ff333f627 Start on an 0.3.2.7-rc changelog 2017-12-13 12:11:17 -05:00
Nick Mathewson 0834f4d93d Merge branch 'maint-0.3.2' into release-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 4c015d9fe4 Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-13 12:06:52 -05:00
Nick Mathewson 93b3c4b844 update to 0.3.2.7-rc 2017-12-13 12:06:37 -05:00
Nick Mathewson f7e393eb4c Another attempt at fixing the STACK warning in tortls.c 
Patch suggestion from catalyst.

Related to 24423
 2017-12-13 10:09:10 -05:00
Nick Mathewson 37fba82c15 Merge branch 'maint-0.3.2' into release-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 dc9f2cdf73 Merge branch 'maint-0.3.2' into release-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 dd5ca25055 Merge branch 'maint-0.3.2' into release-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
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 31ce03a2b9 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-12-12 09:13:12 -05:00
Nick Mathewson 706e6893d1 Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-12 09:13: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 d3b7a2bd27 rename changes file 2017-12-12 09:13:05 -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 cdee62da9e Merge branch 'maint-0.3.0' into maint-0.3.1 2017-12-11 16:56:31 -05:00
Nick Mathewson 58f974818c Merge branch 'maint-0.3.2' into release-0.3.2 2017-12-11 16:56:31 -05: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 da38904efb Merge branch 'maint-0.2.9' into maint-0.3.0 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 eaaa1108a3 Merge branch 'maint-0.2.8' into maint-0.2.9 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 2cfb7b0413 Merge branch 'maint-0.3.2' into release-0.3.2 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 bc1ea4f470 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-12-11 16:54:11 -05:00