05018d55ca
Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9
2019-08-09 13:50:42 +10:00
126d8681e1
Merge branch 'bug31343_31374_041' into bug31343_31374_master
2019-08-09 09:51:50 +10:00
fb19d13f24
Merge branch 'bug31343_31374_040' into bug31343_31374_041
2019-08-09 09:51:44 +10:00
7502881deb
Merge branch 'bug31343_31374_035' into bug31343_31374_040
2019-08-09 09:51:40 +10:00
d4184fca30
Merge branch 'bug31343_31374_029' into bug31343_31374_035
2019-08-09 09:51:35 +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
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
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
b47adcbcab
Merge branch 'tor-github/pr/1183'
2019-08-08 12:30:23 -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
7e32db478b
Merge branch 'ticket31343_035' into ticket31343_040
2019-08-08 09:40:04 -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
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
5cbc0b3881
Merge branch 'maint-0.4.1'
2019-08-08 11:11:42 +10:00
6d0883e9e9
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-08 11:11:35 +10:00
e27a74b1b1
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-08 11:11:27 +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
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
35cfe2e776
Merge remote-tracking branch 'tor-github/pr/1208'
2019-08-07 09:49:49 -04:00
25c97b18f1
changes file for ticket 31320
2019-08-06 13:13:36 -04:00
f557680aa9
Merge remote-tracking branch 'tor-github/pr/1203'
2019-08-06 13:12:42 -04:00
484b654048
test_token_bucket: negate after casting to signed type.
...
Previously we tried multiplying by -1 before casting to int32_t,
which would cause us to cast the -1 to an unsigned before we
multiplied. This gave us compiler warnings on windows.
Fixes bug 31353; bug not in any released Tor.
2019-08-06 11:42:04 -04:00
66437710af
test_util: Do not check for ENETUNREACH unless it exists.
...
Fixes bug 31352; bug not in any released Tor.
2019-08-06 11:35:50 -04:00
79569d86b3
Merge branch 'ticket31343_035' into ticket31343_040
2019-08-06 11:18:40 -04:00
teor
Nick Mathewson
David Goulet
Neel
rl1987