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
29,292 Commits 53 Branches 631 Tags
1ab85566d8cb8707ea29ab02b10edf2da5cfb1ca
Commit Graph

7024 Commits

Author SHA1 Message Date
Nick Mathewson 1ab85566d8 Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-14 10:48:01 -04:00
Nick Mathewson 8f689e0eb2 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-14 10:48:01 -04:00
Nick Mathewson 281854bab7 If options_act() fails, restore the previous value of global_options 
Before 0.3.3.1-alpha, we would exit() in this case immediately.  But
now that we leave tor_main() more conventionally, we need to make
sure we restore things so as not to cause a double free.

Fixes bug 27708; bugfix on 0.3.3.1-alpha.
 2018-09-14 10:34:45 -04:00
Nick Mathewson bd4c50f36b Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-14 09:25:34 -04:00
Nick Mathewson 82b1282772 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-14 09:25:34 -04:00
cypherpunks 7c26f88fd7 rust/protover: validate unknown protocol names use only allowed characters 2018-09-13 16:33:58 +00:00
Nick Mathewson 5e94c93841 Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-13 11:46:04 -04:00
Nick Mathewson 3ddfd5ff25 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-13 11:46:04 -04:00
Nick Mathewson 8253428253 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-13 11:46:04 -04:00
Nick Mathewson 9697c2da46 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-09-13 11:46:04 -04:00
Nick Mathewson 04f210811e Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-12 17:24:41 -04:00
Nick Mathewson f8d5fb42a3 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-12 17:24:41 -04:00
cypherpunks 4fa46fca8e fixup! changes file 2018-09-12 14:22:31 +00:00
Nick Mathewson 73a37d1e54 Check waitpid return value and exit status in tinytest.c 
It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit.  Notably, this happens on a
leak sanitizer failure.

Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
 2018-09-12 08:57:18 -04:00
Nick Mathewson 204a90c935 Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-12 08:17:45 -04:00
Nick Mathewson 73ba308d3d Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4 2018-09-12 08:17:42 -04:00
cypherpunks 03c4d0ab9c rust/protover: fix check for overlapping ranges 
Closes ticket 27649. Bugfix on e6625113c9.
 2018-09-12 02:47:59 +00:00
Nick Mathewson 80b13f7e1e Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-11 15:53:06 -04:00
Nick Mathewson affbe376f9 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-11 15:53:06 -04:00
Mike Perry ae1aea4cc4 Bug 25505: Check circuitmux queues before padding. 2018-09-11 15:53:03 -04:00
Nick Mathewson 3372049154 Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-11 13:09:21 -04:00
Nick Mathewson 46bccc50e5 Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4 2018-09-11 13:09:18 -04:00
Nick Mathewson 8e714d2a02 Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3 2018-09-11 13:09:09 -04:00
Nick Mathewson c3a750486c Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2 2018-09-11 13:09:04 -04:00
Nick Mathewson 198b6354e6 Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9 2018-09-11 13:08:57 -04:00
Nick Mathewson f59b10750e Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-11 12:04:56 -04:00
Nick Mathewson 8a873a5695 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-11 12:04:56 -04:00
Nick Mathewson 8afc100cb5 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-11 12:04:56 -04:00
Nick Mathewson 3119cb5062 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-09-11 12:04:55 -04:00
Karsten Loesing 19429fac23 Update geoip and geoip6 to the September 6 2018 database. 2018-09-11 09:26:59 +02:00
Nick Mathewson b64b7770d1 Start on an 0.3.4.8 changelog. 2018-09-07 09:38:34 -04:00
Nick Mathewson 732ea9120c Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-07 09:15:56 -04:00
Nick Mathewson 8849b2ca3c Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-07 09:15:56 -04:00
Nick Mathewson 0330652346 Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-07 09:15:56 -04:00
Nick Mathewson 0366ae224c Merge branch 'maint-0.2.9' into maint-0.3.2 2018-09-07 09:15:52 -04:00
Nick Mathewson 2ec88a2a6d Tell openssl to build its TLS contexts with security level 1 
Fixes bug 27344, where we'd break compatibility with old tors by
rejecting RSA1024 and DH1024.
 2018-09-07 09:15:06 -04:00
Nick Mathewson 85cee6a749 Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-07 08:48:23 -04:00
Nick Mathewson 967cef2f8f Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4 2018-09-07 08:48:19 -04:00
Nick Mathewson 056003d602 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-07 08:46:45 -04:00
Nick Mathewson b36f128cee Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-07 08:46:45 -04:00
Nick Mathewson a78504dbe6 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-07 08:46:45 -04:00
Nick Mathewson eacaff6ccc Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2 2018-09-07 08:46:41 -04:00
Nick Mathewson 9fcb3ef787 Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9 2018-09-07 08:46:35 -04:00
Nick Mathewson df18cf0e8f Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-07 08:44:40 -04:00
Nick Mathewson 17511b0dca Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-07 08:44:40 -04:00
Nick Mathewson a4930de5e9 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-07 08:44:40 -04:00
Nick Mathewson a5ed62f96c Merge branch 'maint-0.2.9' into maint-0.3.2 2018-09-07 08:44:39 -04:00
Nick Mathewson 912ae2b8dc Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9 2018-09-07 08:44:36 -04:00
Nick Mathewson 08d5fd39d8 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-07 08:42:19 -04:00
Nick Mathewson 4d0abd1b9b Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-07 08:42:19 -04:00