summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-25Merge branch 'maint-0.4.2'teor
2019-10-25Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2teor
2019-10-24Merge branch 'maint-0.4.2'Nick Mathewson
"ours" to avoid version bump.
2019-10-24bump to 0.4.2.3-alpha-devNick Mathewson
2019-10-24Forward-port the changelog for 0.4.2.3-alphaNick Mathewson
2019-10-24A little more text in the SEE ALSO section.Nick Mathewson
2019-10-24Merge remote-tracking branch 'tor-github/pr/1437'Nick Mathewson
2019-10-24configure: Add --disable-module-relay to summaryDavid Goulet
Closes #32266 Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-24hs-v3: Remove a BUG() caused by an acceptable raceDavid Goulet
hs_client_purge_state() and hs_cache_clean_as_client() can remove a descriptor from the client cache with a NEWNYM or simply when the descriptor expires. Which means that for an INTRO circuit being established during that time, once it opens, we lookup the descriptor to get the IP object but hey surprised, no more descriptor. The approach here is minimalist that is accept the race and close the circuit since we can not continue. Before that, the circuit would stay opened and the client wait the SockTimeout. Fixers #28970. Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-23Merge branch 'maint-0.4.2'Nick Mathewson
"ours" to avoid version bump.
2019-10-23Bump to 0.4.2.3-alphaNick Mathewson
2019-10-24Merge remote-tracking branch 'tor-github/pr/1447'teor
2019-10-23Merge branch 'tor-github/pr/1451'David Goulet
2019-10-23Merge remote-tracking branch 'tor-github/pr/1449'teor
2019-10-23changes: file for 32216teor
2019-10-23scripts/git: Avoid sleeping before the last push in git-push-all.shteor
Change the loop order, so that we only sleep between pushes, and avoid sleeping after all the pushes are done. (In rare cases, there may still be an extra sleep.) Part of 32216.
2019-10-23scripts/git: Make git-push-all.sh skip more branches that match upstreamteor
The script now skips master, maint-* and release-* branches that match upstream, not just test branches. And fix "no branches" bugs that this change makes happen more often. Part of 32216.
2019-10-23scripts/git: Pass all unrecognised arguments to git-push-all.shteor
This makes the behaviour of git-push-all.sh -n identical to the other git scripts. Part of 32216.
2019-10-23scripts/git: Fix a variable name typo in git-push-all.shteor
Obviously correct changes to already reviewed code.
2019-10-23changes: file for 29603teor
We merged this change without a changes file.
2019-10-23Merge branch 'maint-0.4.2'teor
2019-10-23Merge branch 'maint-0.4.1' into maint-0.4.2teor
`git merge --strategy ours` to use STATIC for unit tests in maint-0.4.2.
2019-10-23Merge branch 'pr1450_squashed' into maint-0.4.1teor
2019-10-23Authorities reject relays running unsupported Tor release series.Nick Mathewson
Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1, 0.3.2, 0.3.3, and 0.3.4 are now rejected. Also, extract this version-checking code into a new function, so we can test it. Closes ticket 31549. Also reject 0.3.5.0 through 0.3.5.6-rc as unstable.
2019-10-23Merge branch 'maint-0.4.2'teor
2019-10-23Merge branch 'maint-0.4.1' into maint-0.4.2teor
2019-10-23Merge branch 'maint-0.4.0' into maint-0.4.1teor
2019-10-23Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-23Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5teor
2019-10-23Merge branch 'maint-0.2.9' into maint-0.3.5teor
`git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.
2019-10-23Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9teor
2019-10-23Remove outdated note.Philipp Winter
BridgeDB supports bridge-distribution lines since version 0.5.0: <https://bugs.torproject.org/23957>
2019-10-23clarify in man page: we count by powers of twoRoger Dingledine
Make clear in the man page, in both the bandwidth section and the accountingmax section, that Tor counts in powers of two, not powers of ten: 1 GByte is 1024*1024*1024 bytes, not one billion bytes. Resolves ticket 32106.
2019-10-23Tidy whitespace around some STMT_BEGINs and STMT_ENDsteor
2019-10-22Merge branch 'maint-0.4.2'Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2Nick Mathewson
2019-10-22Changes file for options_validate() API changes in #32187.Nick Mathewson
2019-10-22config validation: make the "old_options" argument const.Nick Mathewson
We can't do this with the "options" argument yet, since several places in the code change those right now.
2019-10-22test_options: remove def_opt member of test data.Nick Mathewson
2019-10-22test_options: remove "dflt" part of setup_options().Nick Mathewson
It is no longer used anywhere.
2019-10-22Remove a pair of now-unused default-options arguments.Nick Mathewson
2019-10-22test_options: Fix options_validate() calls in macros.Nick Mathewson
Coccinelle missed these.
2019-10-22Use coccinelle to fix most options_validate() call sites.Nick Mathewson
There was one that it could not find because it was in a macro definition. I used the following semantic patch: @@ expression e1, e2, e3, e4, e5; @@ options_validate(e1, e2, - e3, - e4, e5)
2019-10-22Remove unused arguments from options_validate().Nick Mathewson
This change breaks compilation; a subsequent commit will fix it with a coccinelle patch.
2019-10-22validate_fn(): remove now-unused defaults and from_setconf.Nick Mathewson
These arguments were only used by options_validate, and are now ignored even there.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion