teor
a57e168caa
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5
2019-08-12 09:36:14 +10:00
teor
63ec50e016
Merge branch 'maint-0.4.1'
2019-08-10 07:26:37 +10:00
teor
fc89397fa9
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-10 07:26:30 +10:00
teor
bad0010808
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-10 07:26:21 +10:00
teor
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
teor
254c1bac45
Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9
2019-08-10 07:21:56 +10:00
teor
e07d08a169
Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9
2019-08-10 07:21:43 +10:00
teor
e0f9a8222b
Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9
2019-08-10 07:21:31 +10:00
Nick Mathewson
37bd7fa50d
Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9
2019-08-10 07:16:42 +10:00
teor
8a4635a5fe
Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0
2019-08-09 14:05:46 +10:00
teor
654769bcec
Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5
2019-08-09 14:05:26 +10:00
teor
1ba2bd3599
Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5
2019-08-09 14:01:50 +10:00
teor
e3ba9b7a78
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5
2019-08-09 14:00:01 +10:00
George Kadianakis
519556ef2c
Fix #28525 changes file that is breaking CI.
2019-08-09 13:55:31 +10:00
George Kadianakis
c35aded00a
Fix #28525 changes file that is breaking CI.
2019-08-09 13:55:19 +10:00
teor
1a9555e283
Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5
2019-08-09 13:53:52 +10:00
teor
45f30ba5fa
Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9
2019-08-09 13:53:34 +10:00
teor
6205810f8e
Merge remote-tracking branch 'tor-github/pr/958' into maint-0.3.5
2019-08-09 13:50:59 +10:00
teor
05018d55ca
Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9
2019-08-09 13:50:42 +10:00
teor
126d8681e1
Merge branch 'bug31343_31374_041' into bug31343_31374_master
2019-08-09 09:51:50 +10:00
teor
fb19d13f24
Merge branch 'bug31343_31374_040' into bug31343_31374_041
2019-08-09 09:51:44 +10:00
teor
7502881deb
Merge branch 'bug31343_31374_035' into bug31343_31374_040
2019-08-09 09:51:40 +10:00
teor
d4184fca30
Merge branch 'bug31343_31374_029' into bug31343_31374_035
2019-08-09 09:51:35 +10:00
teor
e609f00342
Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040
2019-08-09 09:50:50 +10:00
teor
65343a966e
Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035
2019-08-09 09:49:35 +10:00
teor
4665ac9ec7
Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035
2019-08-09 09:49:27 +10:00
teor
2bc8989d83
Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029
2019-08-09 09:48:41 +10:00
teor
7667c1cbaf
Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029
2019-08-09 09:48:28 +10:00
Nick Mathewson
0e1fd6d61f
Merge branch 'maint-0.4.1'
2019-08-08 15:25:00 -04:00
Nick Mathewson
53d5b67f07
Merge branch 'ticket31374_035' into maint-0.4.1
2019-08-08 15:24:52 -04:00
David Goulet
2e5519da7c
hs: Initialize the INTRO2 bucket for legacy intro point
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-08 13:40:10 -04:00
Neel
64d2133a61
Move the connection_edge_process_relay_cell() assignments out of if statements in circuit_receive_relay_cell()
2019-08-08 13:05:46 -04:00
David Goulet
b47adcbcab
Merge branch 'tor-github/pr/1183'
2019-08-08 12:30:23 -04:00
David Goulet
0312da75a3
Merge branch 'tor-github/pr/1172'
2019-08-08 12:26:59 -04:00
Nick Mathewson
b560d94ac0
Merge branch 'ticket31374_029' into ticket31374_035
2019-08-08 11:46:24 -04:00
Nick Mathewson
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
Nick Mathewson
71e5af0221
pre-push hook: Only run practracker when a special file is present
...
Closes ticket 30979.
2019-08-08 11:36:05 -04:00
Nick Mathewson
a8f936c817
Merge branch 'maint-0.4.1'
2019-08-08 11:24:08 -04:00
Nick Mathewson
0bc5b7ae95
Merge branch 'ticket31343_040' into maint-0.4.1
2019-08-08 11:23:59 -04:00
Nick Mathewson
7e32db478b
Merge branch 'ticket31343_035' into ticket31343_040
2019-08-08 09:40:04 -04:00
Nick Mathewson
a4400a77a5
Merge branch 'ticket31343_029' into ticket31343_035
2019-08-08 09:39:48 -04:00
Nick Mathewson
878f440901
Fix another time_t/long warning for 31343.
2019-08-08 09:38:03 -04:00
Nick Mathewson
70d0b97ee6
Merge branch 'ticket31343_029' into ticket31343_035
2019-08-08 09:17:23 -04:00
Nick Mathewson
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
teor
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
teor
fcb4d273fb
Merge branch 'doc31089_040' into doc31089_041
2019-08-08 23:07:22 +10:00
teor
c3d6c75945
Merge branch 'doc31089_035' into doc31089_040
2019-08-08 23:07:17 +10:00
teor
25f39bdfc4
Merge branch 'doc31089_029' into doc31089_035
2019-08-08 23:07:12 +10:00
rl1987
1087c48d6e
Hardcode the image into tor-exit-notice.html
2019-08-08 22:46:51 +10:00
teor
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
