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
30,842 Commits 53 Branches 631 Tags
4041ff5543084978ab3a1f765280489ddc8ef02c
Commit Graph

30842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Kadianakis 4041ff5543 Merge branch 'maint-0.3.5' into release-0.3.5 2019-02-14 17:40:58 +02:00
George Kadianakis 9bfe4ed6dd Merge branch 'tor-github/pr/536' into maint-0.3.5 2019-02-14 17:39:34 +02:00
David Goulet ffbc8a7c27 Merge branch 'maint-0.3.5' into release-0.3.5 2019-02-13 11:00:06 -05:00
David Goulet 6efc2a0e1f Merge branch 'tor-github/pr/650' into maint-0.3.5 2019-02-13 10:56:24 -05:00
Nick Mathewson d7052dd480 Merge branch 'maint-0.3.5' into release-0.3.5 2019-02-12 09:56:50 -05:00
Nick Mathewson 2e770216c4 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-02-12 09:56:49 -05:00
Nick Mathewson db209d4dba Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-12 09:56:49 -05:00
Nick Mathewson 7ead2af622 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-02-12 09:56:49 -05:00
Nick Mathewson 70bade0d1a Merge branch 'maint-0.3.5' into release-0.3.5 2019-02-12 09:54:53 -05:00
David Goulet 46b6df7122 test: Fix a warning underflow in rend_cache/clean 
Because the test is adding entries to the "rend_cache" directly, the
rend_cache_increment_allocation() was never called which made the
rend_cache_clean() call trigger that underflow warning:

rend_cache/clean: [forking] Nov 29 09:55:04.024 [warn] rend_cache_decrement_allocation(): Bug: Underflow in rend_cache_decrement_allocation (on Tor 0.4.0.0-alpha-dev 2240fe63feb9a8cf)

The test is still good and valid.

Fixes #28660

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-02-12 09:15:41 -05:00
Karsten Loesing a3f9ddcf03 Update geoip and geoip6 to the February 5 2019 database. 2019-02-12 14:40:42 +01:00
Nick Mathewson fc6e389a25 Merge branch 'maint-0.3.5' into release-0.3.5 2019-02-08 08:37:46 -05:00
Nick Mathewson ab65347819 Merge branch 'ticket29040_1_changes' into maint-0.3.5 2019-02-08 08:37:43 -05:00
Nick Mathewson eca0f87801 Add changes file for bug 29040. 2019-02-08 08:37:23 -05:00
Nick Mathewson 7a9fb4c081 Merge branch 'maint-0.3.5' into release-0.3.5 2019-02-08 08:19:34 -05:00
Nick Mathewson 4b36f9676d Merge remote-tracking branch 'tor-github/pr/670' into maint-0.3.5 2019-02-08 08:19:31 -05:00
Roger Dingledine 1cc234ed00 Merge branch 'maint-0.3.5' into release-0.3.5 2019-02-05 08:10:30 -05:00
Roger Dingledine bca25eebfb Merge branch 'maint-0.3.4' into maint-0.3.5 2019-02-05 08:10:14 -05:00
Roger Dingledine 8ea98c0f4c Merge branch 'maint-0.3.3' into maint-0.3.4 2019-02-05 08:09:47 -05:00
Nick Mathewson 4d7a0a1310 Update Cargo.lock with new comment; suppress 29244. 2019-02-01 16:38:23 +01:00
rl1987 790150e57a Allow empty username/password in SOCKS5 username/password auth message 2019-01-26 11:06:33 +02:00
Nick Mathewson d71ca39682 Another case of possible gmtime angst. 2019-01-23 17:08:23 -05:00
Suphanat Chunhapanya 238a9080c6 hs-v3: add an option param to safe log functions 
We add an option param to safe_str and safe_str_client because in
some case we need to use those functions before global_options is set.
 2019-01-24 04:31:18 +07:00
Suphanat Chunhapanya 8de735f068 hs-v3: fix use after free in client auth config 
We accidentally use `auth` after freeing it in
client_service_authorization_free. The way to solve it is to
free after using it.
 2019-01-24 04:31:07 +07:00
David Goulet 2d74da3d0e test: Fix a warning underflow in rend_cache/clean 
Because the test is adding entries to the "rend_cache" directly, the
rend_cache_increment_allocation() was never called which made the
rend_cache_clean() call trigger that underflow warning:

rend_cache/clean: [forking] Nov 29 09:55:04.024 [warn] rend_cache_decrement_allocation(): Bug: Underflow in rend_cache_decrement_allocation (on Tor 0.4.0.0-alpha-dev 2240fe63feb9a8cf)

The test is still good and valid.

Fixes #28660

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-01-23 13:11:49 -05:00
Nick Mathewson 6144cf99ad Capture more BUG warnings in util/time test 
These are ones that happen on windows only.

Fixes bug 29161.
 2019-01-23 12:37:12 -05:00
Nick Mathewson 54c9c8b04f If address/get_if_addrs6 can't findipv6, log WARN, not ERR 
Fixes 29160, and allows 28668 (treating ERR logs as test failures)
to procede.
 2019-01-23 12:04:57 -05:00
Nick Mathewson 589b60d9e0 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-23 11:18:14 -05:00
rl1987 712a622fce Log an HSDesc we failed to parse at Debug loglevel 2019-01-23 10:37:10 -05:00
Nick Mathewson 1c5f03fba7 Merge branch 'maint-0.3.3' into maint-0.3.4 2019-01-23 09:51:02 -05:00
Nick Mathewson 95b214d8eb Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-23 09:51:02 -05:00
Nick Mathewson f9050681c0 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-01-23 09:51:02 -05:00
Nick Mathewson d1c0dbabfa Merge branch 'maint-0.2.9' into maint-0.3.3 
"ours" merge to avoid dropping non-broken changes files after
removal of merged 0.2.9 changes files.
 2019-01-23 09:50:38 -05:00
Nick Mathewson dd6c2b0ad7 maint-0.2.9: remove changes files that are merged in 0.2.9 releases 
Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
 2019-01-23 09:48:28 -05:00
Nick Mathewson e65d645a7b Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-22 12:27:50 -05:00
Nick Mathewson d9fde87607 correct bug number in 29042 changelog 2019-01-22 12:27:46 -05:00
Nick Mathewson 8c6fcf864b Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-22 11:55:56 -05:00
Nick Mathewson 4159d103d6 Merge branch 'bug29042_035' into maint-0.3.5 2019-01-22 11:55:53 -05:00
Nick Mathewson 5dc6d2318c Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-22 08:04:55 -05:00
Nick Mathewson 9ce1978b5e Merge branch 'bug28979_035' into maint-0.3.5 2019-01-22 08:04:52 -05:00
Nick Mathewson 761f1bf71e Merge branch 'maint-0.3.3' into maint-0.3.4 2019-01-18 12:25:08 -05:00
Nick Mathewson 4cca7fb99b Merge branch 'maint-0.2.9' into maint-0.3.3 2019-01-18 12:25:08 -05:00
Nick Mathewson 448448120f Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-18 12:25:08 -05:00
Nick Mathewson a8580a6836 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-01-18 12:25:08 -05:00
Nick Mathewson 7c6a8c674b Fix documentation for ClientAuth on HSv3. 
The manpage erroneously said "privkey" when "public-key" would have
been correct.  Reported by "Felixix" as ticket 28979. Bugfix on
0.3.5.1-alpha.
 2019-01-16 16:10:20 -05:00
Nick Mathewson f684cd8005 Fail any unit test that causes an unhandled LD_BUG or LOG_ERR 
Closes ticket 28668.
 2019-01-16 15:47:33 -05:00
Nick Mathewson 0ce74ec7e0 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-16 14:43:53 -05:00
Kris Katterjohn f0408b844f Add changes file for bug 28981 
The fix was in commit 61636ad989de674698601284957dacde53cc4984.

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
 2019-01-16 14:40:31 -05:00
Kris Katterjohn cbcf75d728 Update and fix a couple of comments in meminfo.c 
This fixes a typo and also notes that HW_PHYSMEM64 is defined on
NetBSD (not just OpenBSD).

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
 2019-01-16 14:40:15 -05:00
Kris Katterjohn 0f3d88a159 Use HW_PHYSMEM instead of HW_USERMEM in get_total_system_memory_impl 
The code checked for sysctl being available and HW_PHYSMEM being
defined, but HW_USERMEM was actually being used with sysctl instead
of HW_PHYSMEM.

The case for OpenBSD, etc. use HW_PHYSMEM64 (which is obviously a
64-bit variant of HW_PHYSMEM) and the case for OSX uses HW_MEMSIZE
(which appears to be a 64-bit variant of HW_PHYSMEM).

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
 2019-01-16 14:40:15 -05:00