summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-10-15bump version on master to 0.3.3.0-alpha-devtor-0.3.3.0-alpha-devNick Mathewson
2017-10-10Merge remote-tracking branch 'catalyst-oniongit/bug23757'Nick Mathewson
2017-10-10Merge remote-tracking branch 'catalyst-oniongit/bug23755'Nick Mathewson
2017-10-05Match .travis.yml more closelyTaylor Yu
Adjust the GitLab CI configuration to more closely match that of Travis CI. Fixes bug 23757.
2017-10-05Only run "update" job from scheduled pipelinesTaylor Yu
Stop attempting to unconditionally mirror the tor repository in GitLab CI. This prevented developers from enabling GitLab CI on master because the "update" job would attempt to run, causing an unuseful CI failure. Fixes bug 23755.
2017-10-05Merge branch 'maint-0.3.1'Nick Mathewson
2017-10-05Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-10-05Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-10-05Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-10-05Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-10-05add missing subcategory in changes fileNick Mathewson
2017-10-05Merge branch 'maint-0.3.1'Nick Mathewson
2017-10-05Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-10-05Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-10-05Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-10-05Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-10-05Update geoip and geoip6 to the October 4 2017 database.Karsten Loesing
2017-10-04Don't expect permission failure if running as rootTaylor Yu
Skip test_config_include_no_permission() when running as root, because it will get an unexpected success from config_get_lines_include(). This affects some continuous integration setups. Fixes bug 23758.
2017-10-04note cathugger in changes file for 23748Nick Mathewson
2017-10-03hs-v3: Always generate the public key file on diskcathugger
Fixes #23748 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03Merge branch 'bug23672_032_01_squashed'Nick Mathewson
2017-10-03hs: Add changes file for 23653David Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03test: Add an HS v3 descriptor fetch unit testDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03hs-v3: Close pending SOCKS connection on descriptor fetch errorDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03Merge remote-tracking branch 'asn/bug23670'Nick Mathewson
2017-10-03Merge remote-tracking branch 'catalyst-oniongit/bug23739'Nick Mathewson
2017-10-03entrynodes: Better naming for dir info check functions.George Kadianakis
2017-10-03entrynodes: Add changes file.George Kadianakis
2017-10-03Improve docs on using gcovTaylor Yu
Add more explanation in doc/HACKING about how to read gcov output, including a reference to the gcov documentation in the GCC manual. Also add details about how our postprocessing scripts modify gcov output.
2017-10-03Merge branch 'bug23678_032'Nick Mathewson
2017-10-03Follow-up on 23678: fix socks/wrong_protocol testNick Mathewson
2017-10-03torcert.c: mark some lines unreachable by testsNick Mathewson
These are related to handling of failures on functions which can't fail.
2017-10-03Make the fp_pair_map tests cover {get,set}_by_digestsNick Mathewson
2017-10-03Merge remote-tracking branch 'catalyst-oniongit/bug23741'Nick Mathewson
2017-10-03Merge remote-tracking branch 'isis/bug23695'Nick Mathewson
2017-10-03entrynodes: Error msg for missing guard descs is now more informative.George Kadianakis
2017-10-03entrynodes: Move guard dirinfo check below path dirinfo check.George Kadianakis
We do that because we want to use the path fraction dirinfo data in case we are missing primary guard dirinfo.
2017-10-03entrynodes: Be specific about how many primary descriptors we miss.George Kadianakis
2017-10-02bump master to 0.3.2.2-alpha-devNick Mathewson
2017-10-02Don't move gcov output to root directoryTaylor Yu
In scripts/test/coverage, avoid attempting to move gcov output files to the root directory when given no arguments. Fixes bug 23741.
2017-10-02Fix a couple typos in the ChangeLog entries for 0.3.2.2-alpha.tor-0.3.2.2-alphaIsis Lovecruft
2017-10-02Bump version to 0.3.2.2-alpha.Alexander Færøy
Signed-off-by: Isis Lovecruft <isis@torproject.org>
2017-10-02Remove changes files integrated for 0.3.2.2-alpha.Isis Lovecruft
2017-10-02Fix our "not an HTTP Proxy" message in light of HTTPTunnelPortNick Mathewson
When we added HTTPTunnelPort, the answer that we give when you try to use your SOCKSPort as an HTTP proxy became wrong. Now we explain that Tor sorta _is_ an HTTP proxy, but a SOCKSPort isn't. I have left the status line the same, in case anything is depending on it. I have removed the extra padding for Internet Explorer, since the message is well over 512 bytes without it. Fixes bug 23678; bugfix on 0.3.2.1-alpha.
2017-09-29ChangeLog additions for 0.3.2.2-alpha.Isis Lovecruft
2017-09-29Merge remote-tracking branch 'dgoulet/ticket23696_032_01'Nick Mathewson
2017-09-29changes tweak.Nick Mathewson
2017-09-29Merge branches 'bug8185_031' and 'bug8185_diagnostic_032'Nick Mathewson
2017-09-29sched: Always initialize scheduler_last_run to nowDavid Goulet
Because our monotonic time interface doesn't play well with value set to 0, always initialize to now() the scheduler_last_run at init() of the KIST scheduler. Fixes #23696 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-29sched: Don't get KIST stuck in an infinite loopMatt Traudt
When a channel is scheduled and flush cells returns 0 that is no cells to flush, we flag it back in waiting for cells so it doesn't get stuck in a possible infinite loop. It has been observed on moria1 where a closed channel end up in the scheduler where the flush process returned 0 cells but it was ultimately kept in the scheduling loop forever. We suspect that this is due to a more deeper problem in tor where the channel_more_to_flush() is actually looking at the wrong queue and was returning 1 for an empty channel thus putting the channel in the "Case 4" of the scheduler which is to go back in pending state thus re-considered at the next iteration. This is a fix that allows the KIST scheduler to recover properly from a not entirelly diagnosed problem in tor. Fixes #23676 Signed-off-by: David Goulet <dgoulet@torproject.org>
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion