aboutsummaryrefslogtreecommitdiff
path: root/changes
AgeCommit message (Collapse)Author
2019-06-12Merge branch 'tor-github/pr/1099'George Kadianakis
2019-06-12Merge branch 'tor-github/pr/1088'George Kadianakis
2019-06-11Merge branch 'tor-github/pr/1040'David Goulet
2019-06-11Add changes file for 29976Taylor Yu
2019-06-11Merge branch 'tor-github/pr/1031'David Goulet
2019-06-11Merge branch 'tor-github/pr/1083'David Goulet
2019-06-11Merge branch 'maint-0.4.1'David Goulet
2019-06-11Merge branch 'tor-github/pr/1050' into maint-0.4.1David Goulet
2019-06-11Add a changes file for ticket 30686.Nick Mathewson
2019-06-11Merge branch 'maint-0.4.1'Nick Mathewson
2019-06-11Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-06-11Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-06-11Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-06-11Update geoip and geoip6 to the June 10 2019 database.Karsten Loesing
2019-06-11Merge branch 'maint-0.4.1'Nick Mathewson
2019-06-11Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1Nick Mathewson
2019-06-11Merge branch 'tor-github/pr/1060'George Kadianakis
2019-06-11Merge branch 'ticket30769_041_01'George Kadianakis
2019-06-11trunnel: Rename sendme.trunnel to sendme_cell.trunnelDavid Goulet
This is to avoid having two sendme.{c|h} in the repository since the subsystem is implemented in src/core/or/sendme.{c|h}. Fixes #30769 Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-11Merge branch 'ticket30687_042_01'George Kadianakis
2019-06-11token-bucket: Implement a single counter objectDavid Goulet
Closes #30687. Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-11Merge branch 'maint-0.4.1'George Kadianakis
2019-06-11Merge branch 'tor-github/pr/1065' into maint-0.4.1George Kadianakis
2019-06-11Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5teor
2019-06-11Stop hard-coding env vars in the git scriptsteor
Set the env vars: * TOR_MASTER_NAME to override the tor master branch name, and * TOR_WKT_NAME to override the worktree path Fixes bug 30841; bugfix on 0.4.0.1-alpha.
2019-06-11scripts/git: Stop hard-coding the bash path in the git scriptsteor
Some OSes don't have bash in /usr/bin, others have an ancient bash at this path. Fixes bug 30840; bugfix on 0.4.0.1-alpha.
2019-06-10Merge branch 'maint-0.4.1'Nick Mathewson
2019-06-10Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-06-10Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0Nick Mathewson
2019-06-10Merge branch 'maint-0.4.1'Nick Mathewson
2019-06-10Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-06-10Merge remote-tracking branch 'tor-github/pr/1038'Nick Mathewson
2019-06-10Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1Nick Mathewson
2019-06-10Merge branch 'bug30713_035' into bug30713_040teor
2019-06-10Travis: Skip test_rebind on macOS buildsteor
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is set. Skip test_rebind on macOS in Travis builds, because it is unreliable on macOS on Travis. Fixes bug 30713; bugfix on 0.3.5.1-alpha.
2019-06-10Travis: allow the test-stem job to failteor
Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha.
2019-06-07Tolerate net-unreachable failures in util/socketpair_ersatzNick Mathewson
This can happen when we have no network stack configured. Fixes bug 30804; bugfix on 0.2.5.1-alpha.
2019-06-06dirauth: Return a distinct status when formatting annotations failsteor
Adds ROUTER_AUTHDIR_BUG_ANNOTATIONS to was_router_added_t. The out-of-order numbering is deliberate: it will be fixed by later commits for 16564. Fixes bug 30780; bugfix on 0.2.0.8-alpha.
2019-06-06Merge branch 'bug30781_040' into bug30781_masterteor
2019-06-06Merge branch 'bug30781_035' into bug30781_040teor
2019-06-06Merge branch 'bug30781_034' into bug30781_035teor
Moved fix from src/or/routerparse.c to src/feature/dirparse/routerparse.c.
2019-06-06Merge branch 'bug30781_029' into bug30781_034teor
2019-06-06dirparse: Stop crashing when parsing unknown descriptor purpose annotationsteor
We think this bug can only be triggered by modifying a local file. Fixes bug 30781; bugfix on 0.2.0.8-alpha.
2019-06-05Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion