summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-05-18Add support for %include funcionality on torrc #1922Daniel Pinto
config_get_lines is now split into two functions: - config_get_lines which is the same as before we had %include - config_get_lines_include which actually processes %include
2017-05-15bugfix-on version for 21329. thanks, meejah!Nick Mathewson
2017-05-15Fix another lintchanges issueNick Mathewson
2017-05-15fix a bunch of lintchanges complaintsNick Mathewson
2017-05-15Remove changes files for issues resolved in 0.3.0.7.Nick Mathewson
2017-05-15Merge branch 'bug22245_024'Nick Mathewson
2017-05-15Add hs_test_helpers.h to noinst_HEADERSNick Mathewson
2017-05-15Fix a logic error in hibernate.cNick Mathewson
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-15Fix assertion to actually have a chance of failingNick Mathewson
This assertion can only fail if we mess up some of our other code, but let's try to get it right. Closes 22244.
2017-05-15Merge branch 'bug18100_029'Nick Mathewson
2017-05-15Fix the TRPOXY typo in connection_edge.cNick Mathewson
Also add a get_options() call so it compiles. Fixes bug 18100; bugfix on 0.2.6.3-alpha. Patch from "d4fq0fQAgoJ".
2017-05-15Merge remote-tracking branch 'public/bug20270_029'Nick Mathewson
2017-05-14Remove two obsoleted options.Nick Mathewson
Spotted by atagar Closes #22257
2017-05-14fmt two man page entriesRoger Dingledine
whoever made the patch for #17975 wasn't using a proper green-screen vt100. :)
2017-05-14remove stray equals signRoger Dingledine
resolves ticket 22256. this typo crept in during bug 21715's commit fd8284c8.
2017-05-12Merge branch 'ticket21953_029'Nick Mathewson
2017-05-11Enable some windows hardening featuresNick Mathewson
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-11Untangle cleanup logic in test_hs_intropoint.cTaylor Yu
Cleanup logic in test_intro_point_registration() invoked tt_assert() in a way that could cause it to jump backward into the cleanup code if the assertion failed, causing Coverity to see a double free (CID 1397192). Move the tt_assert() calls into a helper function having the well-defined task of testing hs_circuitmap_free_all(). Fixes #22231.
2017-05-11Merge remote-tracking branch 'arma/cleanup22213'Nick Mathewson
2017-05-11Merge branch 'ticket21871_031_03_squashed'Nick Mathewson
2017-05-11prop224: Change encryption keys descriptor encodingDavid Goulet
A descriptor only contains the curve25519 public key in the enc-key field so the private key should not be in that data structure. The service data structures will have access to the full keypair (#20657). Furthermore, ticket #21871 has highlighted an issue in the proposal 224 about the encryption key and legacy key being mutually exclusive. This is very wrong and this commit fixes the code to follow the change to the proposal of that ticket. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-11Improve MyFamily docs, based on patch from nusenuNick Mathewson
Closes ticket 22223
2017-05-11Merge remote-tracking branch 'argonblue/bug22177'Nick Mathewson
2017-05-11Merge remote-tracking branch 'argonblue/bug22221'Nick Mathewson
2017-05-10Remove unused "ROUTER_ADDED_NOTIFY_GENERATOR" internal valueRoger Dingledine
We already have a way to return a 400 response code along with a personalized message response for the uploader. Resolves ticket 22213.
2017-05-10simplify functions now that they don't use options paramRoger Dingledine
2017-05-10Merge branch 'maint-0.3.0'Roger Dingledine
2017-05-10resolve now-unused parameter from #21642 fixRoger Dingledine
2017-05-10Test config line parsing errorsTaylor Yu
Add tests for lower-level syntax errors in config file lines. Fixes #22177.
2017-05-10Merge branch 'maint-0.3.0'Nick Mathewson
2017-05-10Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-05-10Merge branch 'prop275_minimal_029' into maint-0.2.9Nick Mathewson
2017-05-10Resurrect dead code in test_channelpadding.cTaylor Yu
A for-loop in test_channelpadding_timers() would never run because it was trying to increment a counter up to CHANNELS_TO_TEST/3 after an earlier block already incremented it to CHANNELS_TO_TEST/2. Fixes #22221, CID 1405983.
2017-05-10#22211 Fix a comment in routerparse.cNick Mathewson
2017-05-10Merge remote-tracking branch 'public/my-family-list-fix-4498'Nick Mathewson
2017-05-10Restore wget behavior when fetching compressed objectsNick Mathewson
We do this by treating the presence of .z as meaning ZLIB_METHOD, even if Accept-Encoding does not include deflate. This fixes bug 22206; bug not in any released tor.
2017-05-10Fix compilation on libevent2-only systemsNick Mathewson
Patch from rubiate; fixes bug 22219. Remember, we don't support libevent1 any more.
2017-05-10In channelpadding tests that touch libevent, call event_reinit().Nick Mathewson
This is necessary to avoid crashes and test failures on kevent-based systems. Fixes bug 22209; bug not in any released Tor.
2017-05-10add an XXX with a minor bug in dirserv_add_multiple_descriptorsRoger Dingledine
2017-05-09Add a check and a cast in rephist.c to fix a warningNick Mathewson
2017-05-09Tidy or_options_t by removing obsolete options.Nick Mathewson
Nothing was setting or inspecting these fields, and they were marked as OBSOLETE() in config.c -- but somehow we still had them in the or_options_t structure. Ouch.
2017-05-09Merge branch 'dgoulet_ticket22060_031_01_squashed'Nick Mathewson
2017-05-09config: Improve changes file bug22060David Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Parse ports at the start of options_validate()David Goulet
There was a bug that got exposed with the removal of ORListenAddress. Within server_mode(), we now only check ORPort_set which is set in parse_ports(). However, options_validate() is using server_mode() at the start to check if we need to look at the uname but then the ORPort_set is unset at that point because the port parsing was done just after. This commit fixes that. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove {Control,DNS,Dir,Socks,Trans,NATD,OR}ListenAddress optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove TLSECGroup optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove WarnUnsafeSocks optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove CloseHSServiceRendCircuitsImmediatelyOnTimeout optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove CloseHSClientCircuitsImmediatelyOnTimeout optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-05-09config: Remove FastFirstHopPK optionDavid Goulet
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans up the code associated with it. Partially fixes #22060 Signed-off-by: David Goulet <dgoulet@torproject.org>