torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
33,853 Commits 53 Branches 631 Tags
f751b05abf230ace1620a71d491556488f0c0653
Commit Graph

33853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson f3c0a0b9fe Authorities reject relays running unsupported Tor release series. 
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-23 09:57:51 +10:00
teor 53c4068e80 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-23 08:47:27 +10:00
teor b45048feaf Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-23 08:47:23 +10:00
teor 4a5c909ce5 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-23 08:47:15 +10:00
teor 57acdaa3f1 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-23 08:47:08 +10:00
teor d175e70817 Merge branch 'maint-0.2.9' into maint-0.3.5 2019-10-23 08:47:01 +10:00
teor 641f130447 Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0 2019-10-23 08:35:17 +10:00
teor c77162e4e9 Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5 2019-10-23 08:32:52 +10:00
teor 8682442c76 Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9 2019-10-23 08:32:22 +10:00
teor 27965f1ef2 Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5 2019-10-23 08:30:48 +10:00
teor 003be727c4 Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5 2019-10-23 08:28:03 +10:00
teor 1ea19d7a5b Merge branch 'maint-0.2.9' into maint-0.3.5 
`git merge --strategy ours` to take the 0.3.5 changes for 31001,
and ignore the conflicting 0.2.9 changes.
 2019-10-23 08:25:42 +10:00
teor 7660a7cf7d Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9 2019-10-23 08:20:45 +10:00
Philipp Winter 80a198928e Remove outdated note. 
BridgeDB supports bridge-distribution lines since version 0.5.0:
<https://bugs.torproject.org/23957>
 2019-10-23 07:52:05 +10:00
Roger Dingledine 4233fb7014 clarify in man page: we count by powers of two 
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-23 07:50:20 +10:00
Nick Mathewson 443df7e0d2 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 14:47:28 -04:00
Nick Mathewson 2ed194c9a9 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.2 2019-10-22 14:46:10 -04:00
Nick Mathewson 869e15cbf4 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:54:44 -04:00
Nick Mathewson edc3f70635 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:54:43 -04:00
Nick Mathewson 3c071f3002 Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.4.1 2019-10-22 12:54:37 -04:00
Nick Mathewson fb610c9a23 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:53:12 -04:00
Nick Mathewson 5ddc04f49d Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:53:12 -04:00
Nick Mathewson d08d29f15f Merge remote-tracking branch 'tor-github/pr/1341' into maint-0.4.1 2019-10-22 12:53:06 -04:00
Nick Mathewson 796f1d8b75 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:51:33 -04:00
Nick Mathewson 730f0e3da3 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:51:33 -04:00
Nick Mathewson b588b60876 Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.4.1 2019-10-22 12:51:27 -04:00
Nick Mathewson 24d8b931d0 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:15:14 -04:00
Nick Mathewson 9537966a0b Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:15:14 -04:00
Nick Mathewson 9769df89fe Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1 2019-10-22 12:15:06 -04:00
Nick Mathewson 2d8b4f9c48 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:13:56 -04:00
Nick Mathewson c55c75bc97 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:13:55 -04:00
Nick Mathewson c1bf4260b6 Merge remote-tracking branch 'tor-github/pr/1302' into maint-0.4.1 2019-10-22 12:13:47 -04:00
Nick Mathewson 6f3ee65f53 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:11:59 -04:00
Nick Mathewson 34f3d8d407 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:11:59 -04:00
Nick Mathewson d4dde249a0 Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1 2019-10-22 12:11:50 -04:00
Nick Mathewson 4013e50cb7 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-10-22 12:10:30 -04:00
Nick Mathewson 11b1e1715e Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:10:30 -04:00
Nick Mathewson e5b9eefb02 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:10:30 -04:00
Nick Mathewson 6965798a16 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-22 12:10:30 -04:00
Nick Mathewson 21c3488af7 Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5 2019-10-22 12:10:08 -04:00
Nick Mathewson 25a9eab04c Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 12:08:53 -04:00
Nick Mathewson cbc67241db Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 12:08:53 -04:00
Nick Mathewson 4c8af10f0e Merge remote-tracking branch 'tor-github/pr/1385' into maint-0.4.1 2019-10-22 12:08:46 -04:00
Nick Mathewson 05f91b5d74 Hand-edits to the 0.4.2.3-alpha changelog. 2019-10-22 12:06:37 -04:00
Nick Mathewson 9b3c31b250 Light sorting on 0.4.2.3-alpha changelog. 2019-10-22 11:58:18 -04:00
Nick Mathewson fd7f987f30 Run format_changelog. 2019-10-22 11:56:01 -04:00
Nick Mathewson 7ce2432e19 Start an 0.4.2.3-alpha changelog. 2019-10-22 11:55:34 -04:00
teor 0403a2f359 Merge branch 'maint-0.4.2' into release-0.4.2 2019-10-22 20:48:23 +10:00
teor f98b59524c Merge branch 'maint-0.4.1' into maint-0.4.2 2019-10-22 20:48:20 +10:00
teor 2318bb237f Merge branch 'maint-0.4.0' into maint-0.4.1 2019-10-22 20:48:13 +10:00