summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-24final (?) changelog edits for 0.4.2.3-alphator-0.4.2.3-alphaNick Mathewson
2019-10-23Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-10-23Bump to 0.4.2.3-alphaNick Mathewson
2019-10-23fold two more changelog entries into 0423-alpha clNick Mathewson
2019-10-23Merge branch 'maint-0.4.2' into release-0.4.2teor
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' into release-0.4.2teor
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-22Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1Nick Mathewson
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5Nick Mathewson
2019-10-22Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-10-22Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1Nick Mathewson