Nick Mathewson
6ba05eea8e
Merge remote-tracking branch 'tor-github/pr/1247'
2019-08-24 16:32:50 -04:00
Nick Mathewson
7a45c9c1d2
Merge remote-tracking branch 'tor-github/pr/1215'
2019-08-24 16:30:55 -04:00
Nick Mathewson
f1707f7db3
Merge branch 'maint-0.4.1'
2019-08-24 16:29:23 -04:00
David Goulet
d475d7c2fb
Merge branch 'tor-github/pr/1244'
2019-08-22 17:10:22 -04:00
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
Antoine Veuiller
3bf90e704c
doc(hacking): update = to # on sections
2019-08-21 16:22:37 +02:00
Antoine Veuiller
0d6c8eed49
doc(hacking): enhance markdown style
2019-08-21 16:22:08 +02:00
Nick Mathewson
cc48eff2d3
Merge branch 'ticket31176' into ticket31176_merged
2019-08-21 09:46:20 -04:00
Nick Mathewson
edf5a327c5
Merge branch 'ticket30914' into ticket30914_merged
2019-08-20 13:57:05 -04:00
Nick Mathewson
4b1e0dd5b5
remove changes files already contained in 0.4.1.5
2019-08-20 11:16:45 -04:00
Nick Mathewson
6b180703a2
Merge branch 'maint-0.4.1'
...
"ours" to avoid 0.4.1 bump.
2019-08-20 11:15:57 -04:00
Nick Mathewson
3b2a732073
bump to 0.4.1.5-dev
2019-08-20 11:15:45 -04:00
Nick Mathewson
d0b62fff05
forward-port the changelog and release notes for 0.4.1.5
2019-08-20 11:15:17 -04:00
Nick Mathewson
36a27fa2d3
Merge branch 'maint-0.4.1'
...
"ours" to avoid version bump.
2019-08-19 11:36:55 -04:00
Nick Mathewson
ab92881d9a
Update version to 0.4.1.5
2019-08-19 11:35:48 -04:00
Nick Mathewson
e5812c91d6
Merge remote-tracking branch 'tor-github/pr/1231'
2019-08-19 11:34:27 -04:00
Nick Mathewson
29bd43ab03
Merge remote-tracking branch 'tor-github/pr/1224'
2019-08-19 11:26:58 -04:00
Nick Mathewson
b51a822a80
Merge remote-tracking branch 'tor-github/pr/1160'
2019-08-19 11:25:45 -04:00
Nick Mathewson
78d2559d85
Merge branch 'maint-0.4.1'
2019-08-19 11:11:39 -04: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
e7aabfce61
Merge remote-tracking branch 'tor-github/pr/1235'
2019-08-19 11:10:21 -04:00
Nick Mathewson
deccd3aa6a
Merge remote-tracking branch 'tor-github/pr/1225'
2019-08-19 11:08:44 -04:00
George Kadianakis
60adebc499
Merge branch 'tor-github/pr/1217'
2019-08-19 18:07:48 +03:00
George Kadianakis
4185ef29fd
Merge branch 'tor-github/pr/1122'
2019-08-19 18:06:05 +03:00
George Kadianakis
af7cf7d5c1
Merge branch 'tor-github/pr/1233'
2019-08-19 18:05:22 +03:00
George Kadianakis
dfc8c0b536
Merge branch 'tor-github/pr/1214'
2019-08-19 18:04:35 +03:00
George Kadianakis
19e19c1fa8
Merge branch 'tor-github/pr/1154'
2019-08-19 18:03:51 +03:00
George Kadianakis
e411fcabd7
Merge branch 'tor-github/pr/1220'
2019-08-19 18:02:44 +03:00
George Kadianakis
b257e8e553
Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final
2019-08-19 17:53:00 +03:00
Nick Mathewson
c214402a56
Merge branch 'maint-0.4.1'
2019-08-19 10:37:22 -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
a8e6eab379
Merge branch 'tor-github/pr/1213'
2019-08-19 09:49:33 -04:00
David Goulet
81e37b81f1
practracker: Make exceptions.txt happy
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-19 09:47:52 -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
teor
e87e34099c
Fix typos in HiddenServiceExportCircuitID
...
Closes bug 31418.
2019-08-15 18:58:10 +10:00
Roger Dingledine
9b1aa9a572
fix typo in keypin journal log entry (for dir auths)
2019-08-15 02:32:00 -04:00
Mike Perry
2ea2d6f30a
Clarify comment for bug30942 and improve logline.
2019-08-12 14:24:11 -05:00
Mike Perry
6deba34fee
Practracker
2019-08-12 14:06:08 -05: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
Mike Perry
b2821b72bc
Bug 31356: Propogate protover padding support to circpad
2019-08-12 14:06:08 -05:00
Mike Perry
b14bb12e39
Bug 31356: Bump protover for new padding machines
...
By binding the protover numbering to specific padding machines, we can make
our padding negotiation simpler. We probably should have done this in the
first place.
This has the side effect that earlier 0.4.1.x-alpha clients won't negotiate
with 0.4.1.x-stable relays, and 0.4.1.x-stable clients won't negotiate with
earlier 0.4.1.x-alpha relays (or 0.4.0.x relays). Since we don't support
alphas after the stable is released, this is fine, so long as it gets in
before the first stable of 0.4.1.x.
2019-08-12 14:02:35 -05:00
Mike Perry
f6bc9d7c7e
Bug 30992: Demote logline of wronghop padding to protocol warn.
...
This can happen, it's not great, but it's not the worst thing in the world
either. Deferring full fix for 0.4.2/later.
2019-08-12 13:46:32 -05:00
Mike Perry
ccd16caeac
Additional circpad diagnostic logs
...
Also add controller circuit id to all relevant circpad loglines. This will
make debugging any future issues like #30992 much easier.
2019-08-12 13:46:32 -05:00
teor
c9841eb67e
Merge branch 'maint-0.4.1'
2019-08-12 13:10:30 +10:00
teor
6eb5a811d7
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-12 13:10:14 +10:00
teor
20943d00f1
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-12 13:10:05 +10:00
