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
28,068 Commits 53 Branches 631 Tags
f36fea697eb480d9e67cfbd69b122427802fea85
Commit Graph

6477 Commits

Author SHA1 Message Date
Nick Mathewson 62b224f724 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-10 08:20:38 -04:00
Nick Mathewson 59812789f7 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-05-10 08:03:04 -04:00
Nick Mathewson e5acbbd16d Merge branch 'maint-0.3.1' into maint-0.3.2 2018-05-10 08:02:10 -04:00
Nick Mathewson aa08c19703 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-05-10 08:00:35 -04:00
David Goulet bca8a104b2 Having a ControlPort open doesn't mean we are a client 
The any_client_port_set() returns true if the ControlPort is set which is
wrong because we can have that port open but still not behave as a tor client
(like many relays for instance).

Fixes #26062

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-05-09 12:50:53 -04:00
Nick Mathewson ff46d08fd4 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-09 11:53:18 -04:00
Nick Mathewson abde29824c Merge branch 'maint-0.3.2' into maint-0.3.3 2018-05-09 11:53:18 -04:00
Nick Mathewson 394f102ea6 Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2 2018-05-09 11:53:15 -04:00
Nick Mathewson 582f784548 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-09 08:26:08 -04:00
Nick Mathewson a639a67844 Merge branch 'libressl_201805_033' into maint-0.3.3 2018-05-09 08:25:32 -04:00
George Kadianakis 7e8c5e3662 Detect when v3 services get disabled after HUP. 
Remove v3 optimization which made Tor not detect disabling services.

This optimization is not so needed because we only call that function after HUP
anyway.

Fixes bug #25761.
 2018-05-09 11:25:00 +03:00
Roger Dingledine 6db0c006b2 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-08 13:49:34 -04:00
Roger Dingledine b979415e8b manpage fix to stop saying CacheIPv4DNS is on by default 
Stop saying in the manual that clients cache ipv4 dns answers from exit
relays. We haven't used them since 0.2.6.3-alpha, and in ticket 24050
we stopped even caching them as of 0.3.2.6-alpha, but we forgot to say
so in the man page.

Fixes bug 26052; bugfix on 0.3.2.6-alpha.
 2018-05-08 13:13:45 -04:00
Nick Mathewson 0e4f7b56a2 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-07 13:33:19 -04:00
Nick Mathewson 46002aa691 Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3 2018-05-07 13:33:12 -04:00
Nick Mathewson 246765342e Merge branch 'maint-0.3.1' into maint-0.3.2 2018-05-02 08:46:28 -04:00
Nick Mathewson 993e314c6f Merge branch 'maint-0.2.9' into maint-0.3.1 2018-05-02 08:46:28 -04:00
Nick Mathewson 8e81d329ee Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-02 08:46:28 -04:00
Nick Mathewson c66b512671 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-05-02 08:46:28 -04:00
teor d465bd27ed Stop logging stack contents when reading a zero-length bandwidth file 
When directory authorities read a zero-byte bandwidth file, they log
a warning with the contents of an uninitialised buffer. Log a warning
about the empty file instead.

Fixes bug 26007; bugfix on 0.2.2.1-alpha.
 2018-05-02 22:36:23 +10:00
Nick Mathewson bf3e899dce Merge branch 'libressl_201805_029' into maint-0.3.3 2018-05-02 08:26:49 -04:00
Nick Mathewson 75f3fbaa3c LibreSSL compatibility fixes. 
LibreSSL, despite not having the OpenSSL 1.1 API, does define
OPENSSL_VERSION in crypto.h.  Additionally, it apparently annotates
some functions as returning NULL, so that our unit tests need to be
more careful about checking for NULL so they don't get compilation
warnings.

Closes ticket 26006.
 2018-05-02 08:22:05 -04:00
Mike Perry 35e7902116 Bug 25733: Avoid assert failure if all circuits time out. 
Prior to #23100, we were not counting HS circuit build times in our
calculation of the timeout. This could lead to a condition where our timeout
was set too low, based on non HS circuit build times, and then we would
abandon all HS circuits, storing no valid timeouts in the histogram.

This commit avoids the assert.
 2018-04-26 21:28:28 +00:00
Nick Mathewson 148540c505 Merge branch 'maint-0.3.3' into release-0.3.3 2018-04-24 10:38:37 -04:00
Nick Mathewson 89a3fafd49 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-04-24 10:38:37 -04:00
Nick Mathewson 5cc3a0379e Merge branch 'maint-0.2.9' into maint-0.3.1 2018-04-24 10:38:37 -04:00
Nick Mathewson d44753b0e8 Merge branch 'travis_distcheck_033' into maint-0.3.3 2018-04-24 10:38:34 -04:00
Nick Mathewson 34e7dca9c9 Merge branch 'travis_distcheck_029' into maint-0.2.9 2018-04-24 10:38:19 -04:00
Nick Mathewson d8114a1f57 Merge branch 'maint-0.3.3' into release-0.3.3 2018-04-24 10:37:36 -04:00
Nick Mathewson 7e7b052b2a Merge branch 'maint-0.3.2' into maint-0.3.3 2018-04-24 10:37:36 -04:00
Nick Mathewson 9187cdb1cd Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2 2018-04-24 10:36:17 -04:00
Nick Mathewson 08fca9414d Merge branch 'maint-0.3.3' into release-0.3.3 2018-04-24 08:51:58 -04:00
Nick Mathewson 6182f60f75 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-04-24 08:51:55 -04:00
Nick Mathewson d2951b381b Merge branch 'maint-0.3.1' into maint-0.3.2 2018-04-24 08:49:24 -04:00
Nick Mathewson e888634076 Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1 2018-04-24 08:49:20 -04:00
David Goulet b259008c56 hs: Fix memleak in v3 on SIGHUP 
Fixes #25901

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-04-23 11:09:57 -04:00
Nick Mathewson 5807656f8f Merge branch 'maint-0.3.3' into release-0.3.3 2018-04-23 09:24:33 -04:00
Nick Mathewson e8683bcbb1 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-04-23 09:24:33 -04:00
Nick Mathewson 1438c6c713 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-04-23 09:23:31 -04:00
Nick Mathewson 5c3639923f Merge branch 'maint-0.2.9' into maint-0.3.1 2018-04-23 09:23:31 -04:00
Nick Mathewson c4be6dfeab Permit the nanosleep system call in the seccomp2 callbox 
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
 2018-04-23 09:15:40 -04:00
Nick Mathewson 84ff776893 Merge branch 'maint-0.3.3' into release-0.3.3 2018-04-20 14:39:48 -04:00
Nick Mathewson cb813a352c Fix documentation bug 25857: the universe is ::/0, not ::/128 
Patch from CTassisF.
 2018-04-20 14:35:33 -04:00
Nick Mathewson bf466f5503 Merge branch 'travis_distcheck_029' into travis_distcheck_033 2018-04-18 18:34:28 -04:00
Nick Mathewson 6125133715 Add distcheck support to travis configuration. 
Implements 25814.
 2018-04-18 17:33:19 -04:00
Nick Mathewson f0230ee38a Merge branch 'maint-0.3.1' into maint-0.3.2 2018-04-17 10:48:18 -04:00
Nick Mathewson d8a9c9f2c8 Merge branch 'maint-0.3.3' into release-0.3.3 2018-04-17 10:48:18 -04:00
Nick Mathewson 44aa586dea Merge branch 'maint-0.3.2' into maint-0.3.3 2018-04-17 10:48:18 -04:00
Nick Mathewson ce8e7427b9 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-04-17 10:48:08 -04:00
Nick Mathewson d3ff126309 Add support for the coveralls.io coverage tool in travis config 
Closes ticket 25818.
 2018-04-16 14:42:28 -04:00