aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2019-08-22Merge branch 'tor-github/pr/1244'David Goulet
2019-08-21Merge branch 'ticket31176' into ticket31176_mergedNick Mathewson
2019-08-20Merge branch 'ticket30914' into ticket30914_mergedNick Mathewson
2019-08-19Merge remote-tracking branch 'tor-github/pr/1231'Nick Mathewson
2019-08-19Merge remote-tracking branch 'tor-github/pr/1224'Nick Mathewson
2019-08-19Merge remote-tracking branch 'tor-github/pr/1235'Nick Mathewson
2019-08-19Merge remote-tracking branch 'tor-github/pr/1225'Nick Mathewson
2019-08-19Merge branch 'tor-github/pr/1122'George Kadianakis
2019-08-19Merge branch 'tor-github/pr/1214'George Kadianakis
2019-08-19Merge branch 'tor-github/pr/1154'George Kadianakis
2019-08-19Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_finalGeorge Kadianakis
2019-08-19Merge branch 'maint-0.4.1'Nick Mathewson
2019-08-19Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-08-19Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-08-19Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-08-19Merge branch 'tor-github/pr/1213'David Goulet
2019-08-15dirauth: Change dizum IP addressDavid Goulet
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-15fix typo in keypin journal log entry (for dir auths)Roger Dingledine
2019-08-12Clarify comment for bug30942 and improve logline.Mike Perry
2019-08-12Bug 31356: Propogate protover padding support to circpadMike Perry
2019-08-12Bug 31356: Bump protover for new padding machinesMike Perry
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-12Bug 30992: Demote logline of wronghop padding to protocol warn.Mike Perry
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-12Additional circpad diagnostic logsMike Perry
Also add controller circuit id to all relevant circpad loglines. This will make debugging any future issues like #30992 much easier.
2019-08-12Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5teor
2019-08-10Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-08-10Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9teor
2019-08-10Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9teor
2019-08-10Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9teor
2019-08-10Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9Nick Mathewson
2019-08-09Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5teor