b2fa807b99
Merge branch 'maint-0.3.3' into release-0.3.3
2018-08-09 08:47:25 -04:00
fde551a387
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-09 08:47:25 -04:00
8982719f6a
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-09 08:47:24 -04:00
fe19b40fe9
Update geoip and geoip6 to the August 7 2018 database.
2018-08-09 09:44:38 +02:00
bf3a6643e1
Merge branch 'maint-0.3.3' into release-0.3.3
2018-08-08 18:06:15 -04:00
c4d0d9bd24
Merge branch 'bug26948_033' into maint-0.3.3
2018-08-08 18:06:11 -04:00
4012daacd1
Merge branch 'maint-0.3.3' into release-0.3.3
2018-08-08 09:26:23 -04:00
00536254b7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-08 09:26:23 -04:00
8e68fe7e1c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-08 09:26:22 -04:00
27a2a6cb9b
Changes file for 25440
2018-08-08 09:26:21 -04:00
4010525484
Merge branch 'maint-0.3.3' into release-0.3.3
2018-08-03 07:33:45 -04:00
2a6c1585b0
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-03 07:33:45 -04:00
4856a6e6c4
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-03 07:33:45 -04:00
42c6ebda16
Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9
2018-08-03 07:33:39 -04:00
a67d153cc7
Always call tor_free_all() when exiting tor_run_main()
...
We would usually call it through tor_cleanup(), but in some code
paths, we wouldn't. These paths would break restart-in-process,
since leaving fields uncleared would cause assertion failures on
restart.
Fixes bug 26948; bugfix on 0.3.3.1-alpha
2018-07-31 08:45:17 -04:00
51bc8283a0
Merge branch 'maint-0.3.3' into release-0.3.3
2018-07-31 08:30:01 -04:00
373b23a9ee
Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3
2018-07-31 08:29:54 -04:00
524f0cd367
Merge branch 'maint-0.3.3' into release-0.3.3
2018-07-30 09:01:59 -04:00
4f854dbdc2
Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3
2018-07-30 09:01:45 -04:00
1a646880d1
Merge branch 'maint-0.3.3' into release-0.3.3
2018-07-30 08:45:01 -04:00
a159eaf45f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-30 08:45:01 -04:00
fea35ddf00
Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2
2018-07-30 08:44:40 -04:00
6716cd090a
Merge branch 'maint-0.3.3' into release-0.3.3
2018-07-30 08:17:25 -04:00
15d7f24c57
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-30 08:17:24 -04:00
a8bdb851eb
Don't disable an unsupported compiler warning
...
Conditionalize the pragma that temporarily disables
-Wunused-const-variable. Some versions of gcc don't support it. We
need to do this because of an apparent bug in some libzstd headers.
Fixes bug 26785; bugfix on 0.3.2.11.
2018-07-26 12:32:34 -05:00
859d5a7375
Improve connection auth logging
...
Improve the log message when connection initiators fail to authenticate
direct connections to relays.
Fixes bug 26927; bugfix on 0.3.0.1-alpha.
2018-07-25 14:39:31 +10:00
fdc3ad6259
Merge branch 'bug26924_029' into bug26924_032
2018-07-25 14:33:10 +10:00
6443812e34
Stop logging link auth warnings on Single Onion Services and Tor2web
...
Instead, log a protocol warning when single onion services or
Tor2web clients fail to authenticate direct connections to relays.
Fixes bug 26924; bugfix on 0.2.9.1-alpha.
2018-07-25 14:30:33 +10:00
3821081a55
Stop putting unsupported ed25519 link auth in v3 onion service descs
...
Stop putting ed25519 link specifiers in v3 onion service descriptors,
when the intro point doesn't support ed25519 link authentication.
Fixes bug 26627; bugfix on 0.3.2.4-alpha.
2018-07-25 09:16:15 +10:00
a99920c7d4
Stop sending unsupported ed25519 link specifiers in v3 introduce cells
...
Stop sending ed25519 link specifiers in v3 onion service introduce
cells, when the rendezvous point doesn't support ed25519 link
authentication.
Fixes bug 26627; bugfix on 0.3.2.4-alpha.
2018-07-25 09:16:04 +10:00
2b12e26791
Merge branch 'maint-0.3.3' into release-0.3.3
2018-07-20 10:42:29 -04:00
dbf57ecf39
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-20 10:42:29 -04:00
be3a962ca7
Merge branch 'ticket26647_032' into maint-0.3.2
2018-07-20 10:42:23 -04:00
022b8f15da
Ignore mach_approximate_time when targeting macOS 10.9 and earlier
...
Work around two different bugs in the OS X 10.10 and later SDKs that would
prevent us from successfully targeting earlier versions of OS X.
Fixes bug 26876; bugfix on 0.3.3.1-alpha.
2018-07-20 12:29:32 +10:00
852155bb62
Merge branch 'maint-0.3.3' into release-0.3.3
2018-07-19 08:31:07 -04:00
0a60a94a55
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-19 08:31:07 -04:00
209332e71a
Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
2018-07-19 08:30:59 -04:00
e0f99404f5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 16:39:25 -04:00
24ac72877d
Merge branch 'maint-0.3.3' into release-0.3.3
2018-07-18 16:39:25 -04:00
312a42fc85
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 16:39:25 -04:00
93da2cae49
Changes file for bug 26787
2018-07-18 16:39:22 -04:00
783fbe47dd
Merge branch 'maint-0.3.3' into release-0.3.3
2018-07-18 15:04:27 -04:00
c31700d664
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 15:04:14 -04:00
559f79fd79
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 15:03:27 -04:00
a321d72401
Merge branch 'bug26485_029_squashed' into maint-0.2.9
2018-07-18 15:01:03 -04:00
dcee4d4c9c
Warn the directory authority operator if their versions list is bogus
...
Prevents bug 26485; bugfix on 0.1.1.6-alpha.
2018-07-18 15:00:53 -04:00
449d190e2e
SKIP test_key_expiration.sh on Windows until the underlying issue is resolved
...
Skip an unreliable key expiration test on Windows, until the underlying
issue in bug 26076 is resolved.
Fixes bug 26853; bugfix on 0.3.2.1-alpha.
2018-07-18 12:37:12 +10:00
1440c4598c
Merge branch 'maint-0.3.3' into release-0.3.3
2018-07-17 14:56:52 -04:00
28d1057d56
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-17 14:56:52 -04:00
61a2762e35
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-17 14:56:52 -04:00
Nick Mathewson
Karsten Loesing
Taylor Yu
teor
teor