3287cae68c
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5
2019-08-12 09:38:46 +10:00
a57e168caa
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5
2019-08-12 09:36:14 +10:00
5df0b36623
Merge branch 'maint-0.2.9' into maint-0.3.5
...
Delete src/or/buffers.c which was fixup'ed in 0.2.9 but moved in 0.3.5.
The 0.2.9 fix is not required for the 0.3.5 patch.
Resolves merge conflict caused by 30041.
2019-08-10 07:25:57 +10:00
254c1bac45
Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9
2019-08-10 07:21:56 +10:00
e07d08a169
Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9
2019-08-10 07:21:43 +10:00
e0f9a8222b
Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9
2019-08-10 07:21:31 +10:00
37bd7fa50d
Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9
2019-08-10 07:16:42 +10:00
654769bcec
Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5
2019-08-09 14:05:26 +10:00
1ba2bd3599
Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5
2019-08-09 14:01:50 +10:00
e3ba9b7a78
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5
2019-08-09 14:00:01 +10:00
519556ef2c
Fix #28525 changes file that is breaking CI.
2019-08-09 13:55:31 +10:00
c35aded00a
Fix #28525 changes file that is breaking CI.
2019-08-09 13:55:19 +10:00
1a9555e283
Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5
2019-08-09 13:53:52 +10:00
45f30ba5fa
Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9
2019-08-09 13:53:34 +10:00
6205810f8e
Merge remote-tracking branch 'tor-github/pr/958' into maint-0.3.5
2019-08-09 13:50:59 +10:00
05018d55ca
Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9
2019-08-09 13:50:42 +10:00
d4184fca30
Merge branch 'bug31343_31374_029' into bug31343_31374_035
2019-08-09 09:51:35 +10:00
65343a966e
Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035
2019-08-09 09:49:35 +10:00
4665ac9ec7
Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035
2019-08-09 09:49:27 +10:00
2bc8989d83
Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029
2019-08-09 09:48:41 +10:00
7667c1cbaf
Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029
2019-08-09 09:48:28 +10:00
b560d94ac0
Merge branch 'ticket31374_029' into ticket31374_035
2019-08-08 11:46:24 -04:00
3a280b35ee
Fix a warning about casting the results of GetProcAddress.
...
Fixes bug 31374; bugfix on 0.2.9.1-alpha.
2019-08-08 11:44:19 -04:00
a4400a77a5
Merge branch 'ticket31343_029' into ticket31343_035
2019-08-08 09:39:48 -04:00
878f440901
Fix another time_t/long warning for 31343.
2019-08-08 09:38:03 -04:00
70d0b97ee6
Merge branch 'ticket31343_029' into ticket31343_035
2019-08-08 09:17:23 -04:00
cd6cb45372
Restore proper behavior of netinfo skew check
...
My previous fix removed a comparison, which would have caused us to
warn about every skew instead of skews of over an hour.
2019-08-08 09:15:42 -04:00
e83eabc9bf
Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5
...
Merge changed chutney and stem script lines from 29280 with changed
stem script lines from 30591.
2019-08-08 11:17:46 +10:00
1bc2ae7be7
Merge branch 'maint-0.2.9' into maint-0.3.5
...
Merge rust additions in 0.3.5 with sudo deletions in 0.2.9.
2019-08-08 11:10:15 +10:00
e15b9b1790
Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5
2019-08-08 11:07:11 +10:00
8d22c09abf
Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9
2019-08-08 10:55:24 +10:00
518b69b57c
Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
2019-08-08 10:54:12 +10:00
bc9492a938
Merge branch 'ticket31343_029' into ticket31343_035
2019-08-06 11:15:20 -04:00
0849d2a2fd
Avoid using labs() on time_t in channeltls.c
...
On some windows builds, time_t is 64 bits but long is not. This is
causing appveyor builds to fail.
Also, one of our uses of labs() on time_t was logically incorrect:
it was telling us to accept NETINFO cells up to three minutes
_before_ the message they were responding to, which doesn't make
sense.
This patch adds a time_abs() function that we should eventually move
to intmath.h or something. For now, though, it will make merges
easier to have it file-local in channeltls.c.
Fixes bug 31343; bugfix on 0.2.4.4-alpha.
2019-08-06 11:11:06 -04:00
1dd9527897
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-07-01 14:25:12 -04:00
6bc8dedbed
Travis: SKIP_MAKE_CHECK="yes" when running stem
...
And add some comments about stem
Part of 29280.
2019-07-01 14:33:54 +10:00
84f2c0affb
Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035
2019-07-01 14:33:37 +10:00
75f9ae9029
Travis: remove a redundant os: linux line
...
Linux is the first item in the os matrix, so we don't need to specify
it under matrix: include: .
Part of 29280.
2019-07-01 14:25:37 +10:00
ac7ce17983
Travis: show the chutney commit and python version
...
Part of 29280.
2019-07-01 14:25:33 +10:00
b26e3e4c56
Travis: show chutney logs on chutney job failure
...
Part of 29280.
2019-07-01 14:05:26 +10:00
5fda190309
Travis: Log stem's TRACE logs to a file, and tail it on failure
...
Also filter out stem's SocketClosed logs, and fix some nearby comments.
Part of 30591.
2019-07-01 13:01:52 +10:00
fb977f8cac
changes: file for 28795
...
Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc
in December 2018 (of which ~122 were still functional), with a
list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
in June 2019.
Closes ticket 28795.
Note that we created extra lists from DE and US, but they didn't add
any more fallbacks when we tried to merge them.
2019-06-28 21:38:33 +10:00
f3b2a81ce7
fallback: apply the second fallback list from 2019
...
Update the fallback directory mirrors by merging the current list with:
fallback_dirs_2019-06-28-08-58-39_AU_f0437a39ddbc8459.inc
Part of 28795, see that ticket for logs.
2019-06-28 21:16:50 +10:00
37c2808ab0
fallback: apply the first fallback list from 2019
...
Update the fallback directory mirrors by replacing the old list with:
fallback_dirs_2019-06-25-11-49-10_AU_a37adb956fbb5cd2.inc
Part of 28795, see that ticket for logs.
2019-06-28 21:05:00 +10:00
1cad1f9804
Travis: Don't log stem's SocketClosed TRACE logs to the console
...
And fix some nearby comments.
Part of 30591.
2019-06-14 12:13:28 +10:00
63325c0596
Add a chutney mode to travis.yml.
2019-06-12 08:55:38 -04:00
b0826346a6
Travis: control "make check" with its own flag
...
Previously we had "make check" launched whenever DISTCHECK was
false. Now we'd like to turn it off in a few other circumstances,
like running chutney. Maybe stem too?
2019-06-12 08:51:46 -04:00
b0fa1f4fb0
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-06-11 10:17:17 -04:00
0ec4ebd00d
Update geoip and geoip6 to the June 10 2019 database.
2019-06-11 16:12:50 +02:00
dcb8cad4e6
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
2019-06-11 14:51:46 +10:00
teor
Nick Mathewson
George Kadianakis
Karsten Loesing