9be65c440b
Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5
2019-08-12 09:41:14 +10:00
955cf9620c
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5
2019-08-12 09:40:08 +10:00
3287cae68c
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5
2019-08-12 09:38:46 +10:00
bad0010808
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-10 07:26:21 +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
8a4635a5fe
Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0
2019-08-09 14:05:46 +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
7502881deb
Merge branch 'bug31343_31374_035' into bug31343_31374_040
2019-08-09 09:51:40 +10:00
e609f00342
Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040
2019-08-09 09:50:50 +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
0e1fd6d61f
Merge branch 'maint-0.4.1'
2019-08-08 15:25:00 -04:00
53d5b67f07
Merge branch 'ticket31374_035' into maint-0.4.1
2019-08-08 15:24:52 -04:00
0312da75a3
Merge branch 'tor-github/pr/1172'
2019-08-08 12:26:59 -04: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
71e5af0221
pre-push hook: Only run practracker when a special file is present
...
Closes ticket 30979.
2019-08-08 11:36:05 -04:00
a8f936c817
Merge branch 'maint-0.4.1'
2019-08-08 11:24:08 -04:00
0bc5b7ae95
Merge branch 'ticket31343_040' into maint-0.4.1
2019-08-08 11:23:59 -04:00
320f5068a0
Merge branch 'doc31089_041' into doc31089_master
...
Delete outdated comment about serving the image, which had been modified
earlier in the master branch.
2019-08-08 23:08:19 +10:00
fcb4d273fb
Merge branch 'doc31089_040' into doc31089_041
2019-08-08 23:07:22 +10:00
c3d6c75945
Merge branch 'doc31089_035' into doc31089_040
2019-08-08 23:07:17 +10:00
25f39bdfc4
Merge branch 'doc31089_029' into doc31089_035
2019-08-08 23:07:12 +10:00
1087c48d6e
Hardcode the image into tor-exit-notice.html
2019-08-08 22:46:51 +10:00
d6202d3128
scripts/git: add TOR_PUSH_DELAY to git-push-all.sh
...
Add a TOR_PUSH_DELAY variable to git-push-all.sh, which makes the script
push master and maint branches with a delay between each branch. These
delays trigger the CI jobs in a set order, which should show the most
likely failures first.
Also:
* make pushes atomic by default, and
* make the script pass any command-line arguments to git push.
Closes ticket 29879.
2019-08-08 18:59:44 +10:00
0acfd7dcee
Merge branch 'maint-0.4.1'
2019-08-08 11:20:07 +10:00
40d7f1e3a6
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-08 11:19:58 +10:00
0a661cde1d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-08 11:19:38 +10: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
97e7be2717
Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0
2019-08-08 11:07:34 +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
25c97b18f1
changes file for ticket 31320
2019-08-06 13:13:36 -04:00
79569d86b3
Merge branch 'ticket31343_035' into ticket31343_040
2019-08-06 11:18:40 -04: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
21531f35f3
Merge branch 'ticket31311_041' into maint-0.4.1
2019-08-06 09:19:05 -04:00
d7afdb3b0f
Merge branch 'tor-github/pr/1195'
2019-08-06 14:51:47 +03:00
4ee65a6f87
Merge branch 'tor-github/pr/1193'
2019-08-06 07:42:20 -04:00
teor
George Kadianakis
Nick Mathewson
David Goulet
rl1987