05bd43f425
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-21 09:58:52 -05:00
c663716b67
Bump to 0.3.5.8
2019-02-21 09:51:29 -05:00
46910c060f
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid version bump.
2019-02-21 09:50:46 -05:00
508002a4c2
Bump to 0.3.4.11
2019-02-21 09:50:22 -05:00
7614a8b612
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-21 09:49:56 -05:00
41c2bf590b
Update to 0.3.3.12
2019-02-21 09:49:48 -05:00
11760f9149
Start an 0.3.5.8 changelog
2019-02-21 09:41:55 -05:00
8dcecfb000
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-14 18:01:04 +02:00
d83c299eba
Merge branch 'tor-github/pr/689' into maint-0.3.5
2019-02-14 18:00:05 +02:00
4041ff5543
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-14 17:40:58 +02:00
9bfe4ed6dd
Merge branch 'tor-github/pr/536' into maint-0.3.5
2019-02-14 17:39:34 +02:00
ffbc8a7c27
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-13 11:00:06 -05:00
6efc2a0e1f
Merge branch 'tor-github/pr/650' into maint-0.3.5
2019-02-13 10:56:24 -05:00
d7052dd480
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-12 09:56:50 -05:00
db209d4dba
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-12 09:56:49 -05:00
7ead2af622
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-12 09:56:49 -05:00
2e770216c4
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-12 09:56:49 -05:00
70bade0d1a
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-12 09:54:53 -05:00
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
a3f9ddcf03
Update geoip and geoip6 to the February 5 2019 database.
2019-02-12 14:40:42 +01:00
b63404ebba
Changes file for ticket29026.
2019-02-08 08:52:46 -05:00
49ec29044d
Add more openssl includes to fix no-deprecated compilation
...
Closes ticket 29026; patch from Mangix.
2019-02-08 08:51:23 -05:00
b9abdcd6bc
Fix compilation when openssl is compiled without engine support.
...
Patch from Mangix. Closes part of ticket 29026.
2019-02-08 08:50:43 -05:00
fc6e389a25
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-08 08:37:46 -05:00
ab65347819
Merge branch 'ticket29040_1_changes' into maint-0.3.5
2019-02-08 08:37:43 -05:00
eca0f87801
Add changes file for bug 29040.
2019-02-08 08:37:23 -05:00
7a9fb4c081
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-08 08:19:34 -05:00
4b36f9676d
Merge remote-tracking branch 'tor-github/pr/670' into maint-0.3.5
2019-02-08 08:19:31 -05:00
1cc234ed00
Merge branch 'maint-0.3.5' into release-0.3.5
2019-02-05 08:10:30 -05:00
bca25eebfb
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-05 08:10:14 -05:00
8ea98c0f4c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-05 08:09:47 -05:00
4d7a0a1310
Update Cargo.lock with new comment; suppress 29244.
2019-02-01 16:38:23 +01:00
790150e57a
Allow empty username/password in SOCKS5 username/password auth message
2019-01-26 11:06:33 +02:00
d71ca39682
Another case of possible gmtime angst.
2019-01-23 17:08:23 -05:00
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
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
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
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
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
589b60d9e0
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-23 11:18:14 -05:00
712a622fce
Log an HSDesc we failed to parse at Debug loglevel
2019-01-23 10:37:10 -05:00
1c5f03fba7
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-23 09:51:02 -05:00
95b214d8eb
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-23 09:51:02 -05:00
f9050681c0
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-23 09:51:02 -05:00
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
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
e65d645a7b
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-22 12:27:50 -05:00
d9fde87607
correct bug number in 29042 changelog
2019-01-22 12:27:46 -05:00
8c6fcf864b
Merge branch 'maint-0.3.5' into release-0.3.5
2019-01-22 11:55:56 -05:00
4159d103d6
Merge branch 'bug29042_035' into maint-0.3.5
2019-01-22 11:55:53 -05:00
Nick Mathewson
George Kadianakis
David Goulet
Karsten Loesing
Roger Dingledine
rl1987
Suphanat Chunhapanya