summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-12Run "make autostyle".Nick Mathewson
2020-02-12Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3Nick Mathewson
2020-02-12changes file for ticket 33188Taylor Yu
2020-02-12Moved [[RephistTrackTime]] to General Options.swati
2020-02-12Addressed minor changes suggested in the ticketswati
2020-02-12Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3teor
2020-02-12Merge branch 'maint-0.4.2' into maint-0.4.3teor
"ours" merge, because simiar BridgeDistribution fixes have already been merged to maint-0.4.3. (See 32753.) The stem changes in 33075 have already been merged to maint-0.4.3, so this "ours" merge does not affect them.
2020-02-12hs-v3: Remove BUG() that can occur normallyDavid Goulet
Fixes #28992 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-02-12Merge branch 'maint-0.4.1' into maint-0.4.2teor
2020-02-12Merge branch 'maint-0.3.5' into maint-0.4.1teor
2020-02-12Lowercase the BridgeDistribution value from torrc in descriptors.Alexander Færøy
This patch ensures that we always lowercase the BridgeDistribution from torrc in descriptors before submitting it. See: https://bugs.torproject.org/32753
2020-02-12Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5teor
2020-02-11Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
2020-02-11Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
"ours" merge, since the exceptions.txt file is already fixed in this branch.
2020-02-11Remove a redundant practracker exception line in maint-0.4.1Nick Mathewson
This will our "git push" hook not complain about pushing from maint-0.4.1.
2020-02-11Merge remote-tracking branch 'tor-github/pr/1716/head' into maint-0.4.3Nick Mathewson
2020-02-11Undefined name: make_key() -> make_rsa_key()Christian Clauss
2020-02-10Update to 0.4.3.2-alpha-devNick Mathewson
2020-02-10changes file for ticket 33213Taylor Yu
2020-02-11Alphabetized Server Options and Directory Server Optionsswati
2020-02-10Correction to changelog from dgoulettor-0.4.3.2-alphaNick Mathewson
2020-02-10One more light changelog edit.Nick Mathewson
2020-02-10Light edits on the 0.4.3.2-alpha changelogNick Mathewson
2020-02-10start on 0.4.3.2-alpha changelogNick Mathewson
2020-02-10Merge branch 'bug33104_041'Nick Mathewson
2020-02-10Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-02-10Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2020-02-10Merge branch 'maint-0.4.2'Nick Mathewson
2020-02-10Merge branch 'maint-0.3.5' into maint-0.4.0maint-0.4.0Nick Mathewson
2020-02-10Merge branch 'bug33212_035' into maint-0.3.5Nick Mathewson
2020-02-10bump to 0.4.3.2-alphaNick Mathewson
2020-02-10Fix a Rust compilation warning; resolve bug 33212.Nick Mathewson
2020-02-10Add tests for control_event_signal.Nick Mathewson
2020-02-10Merge remote-tracking branch 'tor-github/pr/1711'Nick Mathewson
2020-02-10stats: Fix a function comment typo in rephist.cteor
Comment-only change.
2020-02-07changes file for tickets 32928, 32929Taylor Yu
2020-02-07Updated introductory text for CIRCUIT TIMEOUT and DORMANT MODE optionsswati
2020-02-06Added a section for Dormant mode optionsswati
2020-02-06Merge branch 'bug33103'Nick Mathewson
2020-02-06Merge remote-tracking branch 'public/practracker_regen_overbroad_2'Nick Mathewson
2020-02-06test: Missing hs_init() in some hs_control testsDavid Goulet
Without the hs_init(), the caches are not initialized and the previous commit was causing an assert due to the missing caches. But regardless of that, those tests were not initializing but were calling hs_free_all(). Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-02-06hs-v3: Remove descriptor when we remove client authorizationDavid Goulet
When the ONION_CLIENT_AUTH_REMOVE command is given to tor, now also remove the descriptor associated with the client authorization credentials. Fixes #33148 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-02-05Fix a memory leak in handling GETINFO.Nick Mathewson
Fixes bug 33103; bugfix on 0.4.3.1-alpha.
2020-02-06Merge branch 'pr1701-fix-typo'teor
2020-02-06configure: Fix and improve summary pretty printingDavid Goulet
Fixes #32230 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-02-05Added the NodeFamily option to Node Selection Options sectionswati
2020-02-05Merge remote-tracking branch 'tor-github/pr/1703'Nick Mathewson
2020-02-05Updated the introductory text and titles of Timeout and Node selection optionsswati
2020-02-04Merge branch 'tor-github/pr/1704'George Kadianakis
2020-02-04Merge branch 'tor-github/pr/1700'George Kadianakis