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
25,087 Commits 53 Branches 631 Tags
c2e546aa23fd0de4bb75b909a5693fdd3bcbbb8d
Commit Graph

25087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson c2e546aa23 Merge remote-tracking branch 'argonblue/bug22410' 2017-06-19 15:30:23 -04:00
Taylor Yu 027614c263 Ensure that uint8_t is unsigned char 
Many places in our code assume that uint8_t is the same type as
unsigned char.  Test this assumption in the configure script.  This is
important because of the privileged aliasing properties of character
types in C.

Fixes #22410.
 2017-06-19 14:28:36 -04:00
Nick Mathewson e01e4e0146 Merge branch 'ticket20575_031_01_squashed' 2017-06-19 14:16:21 -04:00
Nick Mathewson 0379439fe8 refer to the correct version 2017-06-19 14:15:04 -04:00
David Goulet 3f807ec058 config: Deprecate HTTPProxy option 
Move the HTTPProxy option to the deprecated list so for now it will only warn
users but feature is still in the code which will be removed in a future
stable version.

Fixes #20575

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-06-19 14:14:17 -04:00
Nick Mathewson bf95d678e8 Remove an XXXX RD comment that neither Roger or I understand. Closes 22420 2017-06-19 14:06:07 -04:00
Nick Mathewson f6946d7a82 Merge remote-tracking branch 'arma/ticket22420' 2017-06-19 14:03:57 -04:00
Nick Mathewson eff5e29404 Merge branch 'maint-0.3.0' into maint-0.3.1 2017-06-19 13:52:19 -04:00
Nick Mathewson 32948ebc54 Merge branch 'maint-0.3.1' 2017-06-19 13:52:19 -04:00
Nick Mathewson 71c701927a Merge branch 'maint-0.2.9' into maint-0.3.0 2017-06-19 13:52:19 -04:00
Nick Mathewson 1c64133cb3 Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9 2017-06-19 13:50:49 -04:00
Nick Mathewson a3139c9750 Bump master to 0.3.2.0-alpha-dev. For 0.3.1, use maint-0.3.1 2017-06-19 11:57:44 -04:00
Nick Mathewson 5641e27ffb Document more files in the datadirectory. 
This improved list comes from the ls -R results that weasel and ln5
sent me.  Thanks!
 2017-06-19 09:57:57 -04:00
Nick Mathewson b4c9eb0aab Document sr-random and diff-cache. 2017-06-16 14:44:04 -04:00
Nick Mathewson a73d0fe9a8 Document key-pinning-journal 
Closes 22347
 2017-06-16 14:26:50 -04:00
Nick Mathewson 59f29970fa Permit the fchmod system call. 
Fixes bug 22516; bugfix on 0.2.5.4-alpha.
 2017-06-16 14:03:02 -04:00
Nick Mathewson 80ad374b84 Remove old callgraph scripts; recommend calltool instead. 2017-06-14 17:44:15 -04:00
Nick Mathewson 493d9cd17b Merge branch 'maint-0.2.9' into maint-0.3.0 2017-06-09 09:58:46 -04:00
Nick Mathewson cd7d006e08 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-06-09 09:58:46 -04:00
Nick Mathewson 3f40d9ec20 Merge branch 'maint-0.3.0' 2017-06-09 09:58:46 -04:00
Nick Mathewson 307be8d4a7 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 2017-06-09 09:58:45 -04:00
Nick Mathewson 24ee8595bf Merge branch 'maint-0.2.6' into maint-0.2.7-redux 2017-06-09 09:58:45 -04:00
Nick Mathewson 3913f959e3 Merge branch 'maint-0.2.5' into maint-0.2.6 2017-06-09 09:58:45 -04:00
Nick Mathewson 325c507a09 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-06-09 09:58:45 -04:00
Karsten Loesing 104e8fa751 Update geoip and geoip6 to the June 8 2017 database. 2017-06-09 15:47:49 +02:00
Nick Mathewson 4f4d3de80c Merge branch 'maint-0.3.0' 
"ours" merge to avoid version bump.
 2017-06-08 14:06:49 -04:00
Nick Mathewson ddfb877242 Merge branch 'maint-0.2.9' into maint-0.3.0 
"ours" merge to avoid version bump.
 2017-06-08 14:06:41 -04:00
Nick Mathewson 875b1fbfba Merge branch 'maint-0.2.8' into maint-0.2.9 2017-06-08 14:06:28 -04:00
Nick Mathewson 6e90d75061 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 2017-06-08 14:06:16 -04:00
Nick Mathewson 2f6be06f6a Merge branch 'maint-0.2.6' into maint-0.2.7-redux 
"ours" merge to avoid version bump.
 2017-06-08 14:06:06 -04:00
Nick Mathewson eb92d11f53 Merge branch 'maint-0.2.5' into maint-0.2.6 
"ours" merge to avoid version bump.
 2017-06-08 14:05:59 -04:00
Nick Mathewson 1a7af7470f Merge branch 'maint-0.2.4' into maint-0.2.5 
"ours" merge to avoid version bump.
 2017-06-08 14:05:37 -04:00
Nick Mathewson 6e7551c50d Add -dev to version number. 2017-06-08 14:05:32 -04:00
Nick Mathewson 90758b2606 Add -dev to version number. 2017-06-08 14:05:29 -04:00
Nick Mathewson 5e554215dd Add -dev to version number. 2017-06-08 14:05:27 -04:00
Nick Mathewson 5c47b92747 Add -dev to version number. 2017-06-08 14:05:22 -04:00
Nick Mathewson 44c8cb986d Add -dev to version number. 2017-06-08 14:05:18 -04:00
Nick Mathewson 95a88f7283 Add -dev to version number. 2017-06-08 14:05:16 -04:00
Nick Mathewson f3804f5999 Add -dev to version number. 2017-06-08 14:05:13 -04:00
Nick Mathewson ec3ce773ad Add -dev to version number. 2017-06-08 14:05:08 -04:00
Nick Mathewson dc47d936d4 fwd-port more changelogs (0.2.4 through 0.2.8) tor-0.3.1.3-alpha 2017-06-08 10:15:41 -04:00
Nick Mathewson a95202d781 Tweak 0.2.9.11 changelog 2017-06-08 09:48:12 -04:00
Nick Mathewson a77a479fa5 copy changelog and releasenotes forward from 0.2.9, 0.3.0 2017-06-08 09:35:47 -04:00
Nick Mathewson d2839eeac9 Fold TROVE-2017-00[45] into changelog 2017-06-08 09:32:00 -04:00
Nick Mathewson 40aa1b1fdc Merge branch 'maint-0.3.0' 2017-06-08 09:29:36 -04:00
Nick Mathewson d389480da5 Merge branch 'maint-0.2.9' into maint-0.3.0 
"ours" merge to avoid version bump.
 2017-06-08 09:29:23 -04:00
Nick Mathewson 8239af0d9c Merge branch 'maint-0.2.8' into maint-0.2.9 
"ours" merge to avoid version bump.
 2017-06-08 09:29:12 -04:00
Nick Mathewson bff08ed8eb Merge branch 'maint-0.2.7-redux' into maint-0.2.8 
"ours" merge to avoid version bump.
 2017-06-08 09:29:05 -04:00
Nick Mathewson 4915d9c5a7 Merge branch 'maint-0.2.6' into maint-0.2.7-redux 
"ours" merge to avoid version bump.
 2017-06-08 09:28:54 -04:00
Nick Mathewson b796ad0300 Merge branch 'maint-0.2.5' into maint-0.2.6 
"ours" merge to avoid version bump.
 2017-06-08 09:28:29 -04:00