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
23,890 Commits 53 Branches 631 Tags
ff02ea65ecb40069ba2023c331c5b60fa5ef2b02
Commit Graph

5028 Commits

Author SHA1 Message Date
Nick Mathewson 5d34df50f8 start on the 0.2.9.11 changelog 2017-06-08 09:03:55 -04:00
Nick Mathewson 9f642b5918 Merge branch 'maint-0.2.9' into release-0.2.9 2017-06-05 15:28:20 -04:00
Nick Mathewson 9fea00928c Merge branch 'bug22460_case2_029_01_squashed' into maint-0.2.9 2017-06-05 15:28:13 -04:00
Nick Mathewson 01878fa309 Changes file for the x509 link certificate case of bug22460 2017-06-05 15:27:33 -04:00
Nick Mathewson f875cd7124 Merge branch 'maint-0.2.9' into release-0.2.9 2017-06-05 12:02:22 -04:00
Nick Mathewson d75be189df Merge branch 'maint-0.2.8' into maint-0.2.9 2017-06-05 12:02:15 -04:00
Nick Mathewson 33fcc0f61d Merge branch 'maint-0.2.7-redux' into maint-0.2.8 2017-06-05 12:01:17 -04:00
Nick Mathewson 3f2d1f7f07 Merge branch 'maint-0.2.6' into maint-0.2.7-redux 2017-06-05 12:00:41 -04:00
Nick Mathewson 9ea3d0877a Merge branch 'maint-0.2.5' into maint-0.2.6 2017-06-05 12:00:27 -04:00
Nick Mathewson 1a540b5792 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-06-05 12:00:08 -04:00
Nick Mathewson e3ebae4804 Fix undefined behavior in geoip_parse_entry(). 
Fixes bug 22490; bugfix on 6a241ff3ff in 0.2.4.6-alpha.

Found by teor using clang-5.0's AddressSanitizer stack-use-after-scope.
 2017-06-05 10:09:39 -04:00
Roger Dingledine a4d5ce4357 Merge branch 'maint-0.2.9' into release-0.2.9 2017-05-25 00:27:08 -04:00
teor ec61ae59a5 Stop leaking keypin-rejected routerinfos on directory authorities 
When directory authorities reject a router descriptor due to keypinning,
free the router descriptor rather than leaking the memory.

Fixes bug 22370; bugfix on 0.2.7.2-alpha.
 2017-05-25 00:09:40 -04:00
Nick Mathewson 54bfbc08ce Merge branch 'maint-0.2.9' into release-0.2.9 2017-05-22 08:31:46 -04:00
Roger Dingledine 6e5486b11a dir auths reject 0.2.9.x for x<5, due to bug 20499 
Directory authorities now reject relays running versions
0.2.9.1-alpha through 0.2.9.4-alpha, because those relays
suffer from bug 20499 and don't keep their consensus cache
up-to-date.

Resolves ticket 20509.
 2017-05-22 08:31:39 -04:00
Nick Mathewson 480aa722c5 Merge branch 'maint-0.2.9' into release-0.2.9 2017-05-16 08:39:15 -04:00
Nick Mathewson a7bcab2639 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-05-16 08:38:59 -04:00
teor 5b45d73293 Update fallback directory mirrors in May 2017 
Replace the 177 fallbacks originally introduced in Tor 0.2.9.8 in
December 2016 (of which ~126 were still functional), with a list of
151 fallbacks (32 new, 119 existing, 58 removed) generated in May 2017.

Resolves ticket 21564.
 2017-05-16 19:02:42 +10:00
Nick Mathewson a6514b8a20 Fix a logic error in hibernate.c 
Closes bug 22245; bugfix on 0.0.9rc1, when bandwidth accounting was
first introduced.

Found by Andrey Karpov and reported at https://www.viva64.com/en/b/0507/
 2017-05-15 11:43:18 -04:00
Nick Mathewson 4473271c66 Fix the TRPOXY typo in connection_edge.c 
Also add a get_options() call so it compiles.

Fixes bug 18100; bugfix on 0.2.6.3-alpha. Patch from "d4fq0fQAgoJ".
 2017-05-15 11:16:50 -04:00
Nick Mathewson 503f101d2b Enable some windows hardening features 
One (HeapEnableTerminationOnCorruption) is on-by-default since win8;
the other (PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION) supposedly only
affects ATL, which (we think) we don't use.  Still, these are good
hygiene. Closes ticket 21953.
 2017-05-11 16:39:02 -04:00
Nick Mathewson 0633d14b47 Merge branch 'maint-0.2.9' into release-0.2.9 2017-05-10 16:26:53 -04:00
Nick Mathewson 8f5da804da Merge branch 'prop275_minimal_029' into maint-0.2.9 2017-05-10 16:26:45 -04:00
Nick Mathewson a49521bd0c Merge branch 'maint-0.2.9' into release-0.2.9 2017-05-08 13:40:22 -04:00
Nick Mathewson 0df22e8f5f Merge branch 'bug21943_029' into maint-0.2.9 2017-05-08 13:40:14 -04:00
Nick Mathewson 1cdad9782d Add a changes file for 21943. 2017-05-08 13:39:59 -04:00
Nick Mathewson c84c5cc402 Merge branch 'maint-0.2.9' into release-0.2.9 2017-05-08 08:08:29 -04:00
Nick Mathewson 5ff0b519ec Merge branch 'maint-0.2.8' into maint-0.2.9 2017-05-08 08:07:32 -04:00
Nick Mathewson dc34cd7a04 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 2017-05-08 08:07:19 -04:00
Nick Mathewson 71dd1d716a Merge branch 'maint-0.2.6' into maint-0.2.7-redux 2017-05-08 08:07:11 -04:00
Nick Mathewson 159ddf6dde Merge branch 'maint-0.2.5' into maint-0.2.6 2017-05-08 08:07:04 -04:00
Nick Mathewson 68d6720452 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-05-08 08:06:59 -04:00
Karsten Loesing 5207e41ffe Update geoip and geoip6 to the May 2 2017 database. 2017-05-08 10:09:42 +02:00
Nick Mathewson af9bbaa8c2 Merge branch 'maint-0.2.9' into release-0.2.9 2017-04-24 09:31:28 -04:00
David Goulet 4a9f689430 control: Wrong check on base16_decode return value 
The GETINFO extra-info/digest/<digest> broke in commit 568dc27a19 that
refactored the base16_decode() API to return the decoded length.
Unfortunately, that if() condition should have checked for the correct length
instead of an error which broke the command in tor-0.2.9.1-alpha.

Fixes #22034

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-04-24 09:20:13 -04:00
Nick Mathewson e0d8ce3b27 Merge branch 'maint-0.2.9' into release-0.2.9 2017-04-06 08:33:01 -04:00
Nick Mathewson 7d7770f735 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-04-06 08:31:54 -04:00
Nick Mathewson 91c6b18ca0 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 2017-04-06 08:31:32 -04:00
Nick Mathewson 44bc8821b1 Merge branch 'maint-0.2.6' into maint-0.2.7-redux 2017-04-06 08:31:23 -04:00
Nick Mathewson 21d776738c Merge branch 'maint-0.2.5' into maint-0.2.6 2017-04-06 08:31:18 -04:00
Nick Mathewson a8a860e1da Merge branch 'maint-0.2.4' into maint-0.2.5 2017-04-06 08:31:12 -04:00
Karsten Loesing 9d7933296c Update geoip and geoip6 to the April 4 2017 database. 2017-04-06 10:52:39 +02:00
Nick Mathewson ec5fe41209 Avoid a double-mark bug when makring a pending circuit as "too old" 
Fixes bug 20059; bugfix on 0.1.0.1-rc.
 2017-03-15 11:05:37 -04:00
Nick Mathewson adf46d69e7 Merge branch 'maint-0.2.9' into release-0.2.9 2017-03-08 10:12:18 -05:00
Nick Mathewson d642ceb8df Merge branch 'maint-0.2.8' into maint-0.2.9 2017-03-08 10:12:06 -05:00
Nick Mathewson 2cfecec9c7 Merge branch 'maint-0.2.7-redux' into maint-0.2.8 2017-03-08 10:11:23 -05:00
Nick Mathewson 25c28bc2d9 Merge branch 'maint-0.2.6' into maint-0.2.7-redux 2017-03-08 10:11:05 -05:00
Nick Mathewson ecc73c3c03 Merge branch 'maint-0.2.5' into maint-0.2.6 2017-03-08 10:10:44 -05:00
Nick Mathewson 933a1e7997 Merge branch 'maint-0.2.4' into maint-0.2.5 2017-03-08 10:10:29 -05:00
Karsten Loesing 4488c319dd Update geoip and geoip6 to the March 7 2017 database. 2017-03-08 09:41:35 +01:00