aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
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-11Give a compile warning when we don't have any flags for minherit().Nick Mathewson
Part of ticket 30686.
2019-06-11Give a more useful failure messgae when we fail to minherit().Nick Mathewson
Part of ticket 30686.
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 '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/1091' into maint-0.3.5teor
2019-06-11Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5teor
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 branch 'maint-0.4.1'Nick Mathewson
2019-06-10Bump master to 0.4.2.0-alpha-devNick Mathewson
2019-06-10test: fix a typo in test_rebind.shteor
Closes 30821.
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-06bump to 0.4.1.2-alpha-devNick Mathewson
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-06dirauth: Fix some comments in the router status processing code.teor
Fixes comments in dirserv_router_get_status() and was_router_added_t. Preparation for 30780 and 16564.
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/952' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0Nick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/1076'Nick Mathewson
2019-06-05Bug 29034: Cleanup hs circuitmap when purpose changes.Mike Perry
Leave the other rend and hs_ident data around until circuit free, since code may still try to inspect it after marking the circuit for close. The circuitmap is the important thing to clean up, since repurposed intropoints must be removed from this map to ensure validity.
2019-06-05Revert "hs: Implement a helper to repurpose a circuit"Mike Perry
This reverts commit 3789f22bcbfbc6de415a838e4c4bfb2555c7d6c3.
2019-06-05Revert "test: Add test_hs_circ.c for HS circuit testing"Mike Perry
This reverts commit 41b94722e5c93ec06911f9c63296a65ce295c1ea.
2019-06-05Add missing newline after decode_intro_points() closing bracketNeel Chauhan
2019-06-05Don't access rend data after a circuit has been marked for close.George Kadianakis
This can cause issues if the circuit was repurposed into a padding circuit instead of closing, since in that case we will wipe off the rend_data.
2019-06-05Replace a missing end-of-comment stringNick Mathewson
This happened when I went to fix long lines after running "make autostyle".
2019-06-05Run "make autostyle."Nick Mathewson
2019-06-05Bump to 0.4.1.2-alphaNick Mathewson
2019-06-05Merge remote-tracking branch 'tor-github/pr/1053'Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion