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,139 Commits 53 Branches 631 Tags
f8dc1164ba86099d4106dffa84435366bf6cdcd6
Commit Graph
25139 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Goulet f8dc1164ba prop224: Add connection and circuit identifier object 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-07-07 11:12:26 -04:00
Nick Mathewson 90046a09dd Merge branch 'maint-0.3.1' 2017-06-22 10:56:08 -04:00
Nick Mathewson 2c49a9852d Merge branch 'maint-0.3.0' into maint-0.3.1 2017-06-22 10:56:08 -04:00
Nick Mathewson bdd267e74d Combine our "don't do this if no consensus" entryguards checks 
Suggested by asn on 22400 review.
 2017-06-22 09:28:30 -04:00
Nick Mathewson ee7101a875 expand changes file for bug 22461 2017-06-22 08:16:56 -04:00
Nick Mathewson 34ecfeb479 whitespace fix 2017-06-22 08:16:48 -04:00
Nick Mathewson b9d8c8b126 Merge remote-tracking branch 'rl1987/bug22461' 2017-06-22 08:11:36 -04:00
Nick Mathewson dc9ec519b5 Merge remote-tracking branch 'public/bug7890' 2017-06-22 08:04:12 -04:00
Roger Dingledine 005500e14d make assign_onionskin_to_cpuworker failure case more clear 
now it looks like the other time we call it
 2017-06-21 17:42:10 -04:00
Nick Mathewson 3a8a92fddd Merge branch 'callgraph_reduction_v2' 2017-06-21 16:47:55 -04:00
Nick Mathewson 1c0a2335cd Extract channel_do_open_actions() from non-open _change_state cases 
This reduces the size of the largest SCC in the callgraph by 30
functions, from 58 to 28.
 2017-06-21 14:03:00 -04:00
Nick Mathewson 5d3f484f4a Merge branch 'maint-0.3.1' 2017-06-21 13:54:07 -04:00
Nick Mathewson 784b29a2bf Merge branch 'bug22356_029' into maint-0.3.1 2017-06-21 13:54:02 -04:00
Nick Mathewson 72b132e2a4 changes file for ticket22311 2017-06-21 13:49:17 -04:00
Nick Mathewson 35d6313500 Call it a BUG to use -1 in authdir_mode_handles_descs 2017-06-21 13:49:17 -04:00
huyvq ad97714f22 Remove obsolete authdir_mode_any_nonhidserv() 
- Replace it with authdir_mode()
 2017-06-21 13:49:17 -04:00
huyvq 18cd1993ca Convert authdir_mode_handles_descs() to alternative wrappers 
-authdir_mode_handles_descs(options, ROUTER_PURPOSE_BRIDGE) to authdir_mode_bridge(options).

- authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL) to authdir_mode_v3(options).
 2017-06-21 13:49:17 -04:00
huyvq d92b999757 Convert authdir_mode_handles_descs(options, -1) with authdir_mode(options) 2017-06-21 13:49:17 -04:00
huyvq 0471c905a1 Remove obsolete authdir_mode_any_main() 2017-06-21 13:49:17 -04:00
Nick Mathewson f0a5416f95 Merge branch 'Ryman-bug5847-squashed' 2017-06-21 12:19:55 -04:00
Kevin Butler 0a96d11539 Better error message for GETINFO desc/(id|name) whenever microdescriptors are in use. Fixes #5847. 2017-06-21 12:19:01 -04:00
Nick Mathewson 884c0ffe3b Merge branch 'maint-0.3.1' 2017-06-20 20:29:00 -04:00
Nick Mathewson e51e7bd38b Merge branch 'bug22502_redux_031' into maint-0.3.1 2017-06-20 20:27:48 -04:00
Nick Mathewson c999e84436 Merge branch 'bug22672_031' into maint-0.3.1 2017-06-20 20:26:45 -04:00
Nick Mathewson 3830599a63 Merge branch 'maint-0.3.1' 2017-06-20 14:18:35 -04:00
Nick Mathewson c4152a25e3 Note that bw_accounting is obsoleted by values in the state file 
Closes ticket 16082.
 2017-06-20 14:18:10 -04:00
Nick Mathewson fa2bd196b4 Merge branch 'maint-0.3.1' 2017-06-20 13:54:35 -04:00
Nick Mathewson fecc66d1e6 Note that pkgconfig is now needed, and has been for a few releases. 2017-06-20 13:54:30 -04:00
Nick Mathewson a9a76aa6ae Merge branch 'maint-0.3.1' 2017-06-20 13:35:44 -04:00
Nick Mathewson 392e5457b8 Merge remote-tracking branch 'argonblue/bug22638' into maint-0.3.1 2017-06-20 13:35:38 -04:00
Nick Mathewson 9328bd524e Enforce the rule that COMPRESS_OK means progress was made. 
If COMPRESS_OK occurs but data is neither consumed nor generated,
treat it as a BUG and a COMPRESS_ERROR.

This change is meant to prevent infinite loops in the case where
we've made a mistake in one of our compression backends.

Closes ticket 22672.
 2017-06-20 12:26:57 -04:00
Nick Mathewson 945256188a mingw/windows printf lacks %zd ; use %lu and casts instead 
(This approach can lose accuracy, but it's only in debug-level messages.)

Fixes windows compilation. Bugfix on recent compress.c changes; bug
not in any released Tor.
 2017-06-20 12:12:55 -04:00
Taylor Yu 25edb41e6f Fix compress_none.c header comment 
The Doxygen \file markup for compress_none.c had the wrong filename.
Fixes #22638.
 2017-06-20 11:27:17 -04:00
Nick Mathewson 782eb02b79 Send the correct content-encoding when serving cached_dir_t objects 
A cached_dir_t object (for now) is always compressed with
DEFLATE_METHOD, but in handle_get_status_vote() to we were using the
general compression-negotiation code decide what compression to
claim we were using.

This was one of the reasons behind 22502.

Fixes bug 22669; bugfix on 0.3.1.1-alpha
 2017-06-20 11:26:51 -04:00
Nick Mathewson eb632afb17 Correct the fix to bug 22629 to permit trailing non-garbage 
This change makes it so that we can decompress concatenated zstd
outputs.
 2017-06-20 10:24:22 -04:00
Nick Mathewson 94a1b8b66c Add a unit test for decompressing concatenated inputs. 2017-06-20 10:21:35 -04:00
Nick Mathewson dd9f255e5b Merge branch 'maint-0.3.1' 2017-06-20 10:12:47 -04:00
Nick Mathewson c1c938e80c add a changes file for 22626, 22628, and 22629 (parts of 22502) 2017-06-20 10:12:40 -04:00
Nick Mathewson 2341368515 Merge branch 'maint-0.3.1' 2017-06-20 10:06:19 -04:00
Nick Mathewson 1c0459f19a Merge remote-tracking branch 'teor/bug22502' into maint-0.3.1 2017-06-20 10:04:16 -04:00
Nick Mathewson 32e486de97 Don't expand guard sample set unless consensus is "reasonably live" 
Fixes what I think is the main root cause of 22400. Bugfix on
0.3.0.1-alpha.
 2017-06-19 15:48:47 -04:00
Nick Mathewson c2e546aa23 Merge remote-tracking branch 'argonblue/bug22410' 2017-06-19 15:30:23 -04:00
Nick Mathewson e3efc076c5 Downgrade "assign_to_cpuworker failed" to INFO. 
Closes ticket 22356
 2017-06-19 15:24:33 -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