teor
7c92f4faa2
Merge branch 'bug31463_040' into bug31463_041
2019-08-22 22:10:06 +10:00
teor
8b32d22a07
Merge branch 'bug31463_035' into bug31463_040
2019-08-22 22:10:00 +10:00
Sebastian Hahn
190386f1c4
Fix gcc build exclude on travis
...
The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't,
either. Reduces the number of builders by one.
2019-08-22 22:09:32 +10:00
Nick Mathewson
6a89b01049
Merge remote-tracking branch 'tor-github/pr/1230' into maint-0.4.1
2019-08-19 11:11:32 -04:00
Nick Mathewson
90f4ed2335
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-19 10:37:21 -04:00
Nick Mathewson
5653b93a1d
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-08-19 10:37:21 -04:00
Nick Mathewson
bba64c9882
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-19 10:37:21 -04:00
David Goulet
5a1c3e44f7
dirauth: Change dizum IP address
...
New IP address from 194.109.206.212 to 45.66.33.45.
Signed request from Alex de Joode, operator of dizum:
https://trac.torproject.org/projects/tor/ticket/31406
Published descriptor by dizum on August 12th, 2019:
--
r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 15:28:40 45.66.33.45 443 80
s Authority Fast Running Stable V2Dir Valid
v Tor 0.4.0.5
pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1
w Bandwidth=20 Unmeasured=1
p reject 1-65535
--
Finally, confirmed by DNS:
$ dig +short tor.dizum.com
45.66.33.45
Closes #31406
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-15 08:20:47 -04:00
Mike Perry
02c89c955d
Bug 31356: Add changes file.
...
Also document the other log changes in this branch.
2019-08-12 14:06:08 -05:00
teor
20943d00f1
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-12 13:10:05 +10:00
teor
a1d8409ee2
Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0
2019-08-12 09:55:29 +10:00
teor
d253b31cec
Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5
2019-08-12 09:54:35 +10:00
teor
31fb2bceb5
Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5
2019-08-12 09:53:59 +10:00
teor
789fdbed05
Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5
2019-08-12 09:52:56 +10:00
teor
a92b05392e
Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5
2019-08-12 09:51:35 +10:00
teor
224825e7ee
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5
2019-08-12 09:51:00 +10:00
teor
e5be039494
Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5
2019-08-12 09:50:42 +10:00
teor
f65f4b5c38
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5
2019-08-12 09:49:53 +10:00
teor
8ea0903222
Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5
2019-08-12 09:45:32 +10:00
teor
6ed56ee4ea
Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5
2019-08-12 09:44:46 +10:00
teor
2d4772dc47
Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5
2019-08-12 09:43:37 +10:00
teor
ef345ab56d
Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5
2019-08-12 09:42:15 +10:00
teor
9be65c440b
Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5
2019-08-12 09:41:14 +10:00
teor
955cf9620c
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5
2019-08-12 09:40:08 +10:00
teor
3287cae68c
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5
2019-08-12 09:38:46 +10:00
teor
bad0010808
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-10 07:26:21 +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
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
7502881deb
Merge branch 'bug31343_31374_035' into bug31343_31374_040
2019-08-09 09:51:40 +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
53d5b67f07
Merge branch 'ticket31374_035' into maint-0.4.1
2019-08-08 15:24:52 -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
0bc5b7ae95
Merge branch 'ticket31343_040' into maint-0.4.1
2019-08-08 11:23:59 -04:00
teor
40d7f1e3a6
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-08 11:19:58 +10:00
teor
0a661cde1d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-08 11:19:38 +10:00
teor
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
