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
35,255 Commits 53 Branches 631 Tags
023728cb843daeff1d87e79f6a4cdf68c137efee
Commit Graph

35255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 023728cb84 Merge branch 'maint-0.4.3' into release-0.4.3 2020-09-17 13:56:40 -04:00
Nick Mathewson 078194ecaf Merge branch 'maint-0.3.5' into maint-0.4.3 2020-09-17 13:56:40 -04:00
David Goulet 47f1d19f8e test: Increment rend cache allocation before freeing 
The rend_cache/entry_free was missing the rend cache allocation increment
before freeing the object.

Without it, it had an underflow bug:

  Sep 17 08:40:13.845 [warn] rend_cache_decrement_allocation(): Bug: Underflow
  in rend_cache_decrement_allocation (on Tor 0.4.5.0-alpha-dev
  7eef9ced61)

Fixes #40125

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-09-17 13:00:23 -04:00
Nick Mathewson e78ce52aff Merge branch 'maint-0.4.3' into release-0.4.3 2020-08-13 14:20:39 -04:00
Nick Mathewson 7915b651d9 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-13 14:20:39 -04:00
Nick Mathewson 45d9830493 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-13 14:20:39 -04:00
Nick Mathewson 72484a4953 Merge remote-tracking branch 'tor-gitlab/mr/125' into maint-0.3.5 2020-08-13 14:20:27 -04:00
Nick Mathewson 146e4cfa95 Merge branch 'maint-0.4.3' into release-0.4.3 2020-08-12 20:21:04 -04:00
Nick Mathewson 34919368ce Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-12 20:21:04 -04:00
Nick Mathewson 07f0210a05 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-12 20:21:04 -04:00
Nick Mathewson aeafb7f44f Improve comments in .gitlab-ci.yml 2020-08-12 20:20:58 -04:00
Nick Mathewson 41a7ab96e5 CI: Turn on stem with 044 and later. 2020-08-12 20:13:18 -04:00
Nick Mathewson f9bb49d870 Fix allocation counting in clean_v2_descs_as_dir test. 
Without this fix, running this test on its own would fail.

Fixes bug 40099. Bugfix on ade5005853 in 0.2.8.1-alpha.
 2020-08-12 14:25:46 -04:00
Nick Mathewson f94ad3d32a Merge branch 'maint-0.4.3' into release-0.4.3 2020-08-12 12:29:17 -04:00
Nick Mathewson 309eafbc3c Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-12 12:29:17 -04:00
Nick Mathewson 02bb719a94 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-12 12:29:17 -04:00
Nick Mathewson f5b9471547 CI: improve output when skipping doxygen 2020-08-12 12:28:44 -04:00
Nick Mathewson 50b7bd243f Try disabling "make all" when checking docs. 2020-08-12 12:28:44 -04:00
Nick Mathewson fe0e62ddc4 CI: Try to enable integration tests, hardening, and clang. 2020-08-12 11:29:46 -04:00
Nick Mathewson cff2c3d5fa Merge branch 'maint-0.4.3' into release-0.4.3 2020-08-12 08:39:41 -04:00
Nick Mathewson 489d33e190 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-12 08:39:41 -04:00
Nick Mathewson 6ef40144ae Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-12 08:39:41 -04:00
George Kadianakis 8182f1351a CI: Remove VS2015 AppVeyor build. 2020-08-12 14:05:21 +03:00
Nick Mathewson c87a5d7af5 Merge branch 'maint-0.4.3' into release-0.4.3 2020-08-11 12:37:08 -04:00
Nick Mathewson 0ec2d1528c Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 12:37:08 -04:00
Nick Mathewson c6c0af403c Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 12:37:08 -04:00
Nick Mathewson adb7268236 CI: label our python versions. 2020-08-11 12:24:03 -04:00
Nick Mathewson 9eb316de42 CI: Only run doxygen on 0.4.3 and later. 2020-08-11 12:22:35 -04:00
Nick Mathewson 6a91a50d32 CI: enable documentation testing 2020-08-11 11:06:49 -04:00
Nick Mathewson 4ccf99b549 Merge branch 'maint-0.4.3' into release-0.4.3 2020-08-11 11:03:24 -04:00
Nick Mathewson 6bee9bd481 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 11:03:24 -04:00
Nick Mathewson da8577bb75 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 11:03:24 -04:00
Nick Mathewson aa2c93b90b Fix a pair of typos in ci-driver.sh. 2020-08-11 11:03:11 -04:00
Nick Mathewson e0caad5d4f Merge branch 'maint-0.4.3' into release-0.4.3 2020-08-11 10:44:40 -04:00
Nick Mathewson 262ddfee7a Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-11 10:44:40 -04:00
Nick Mathewson e4a6d9d5a9 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-11 10:44:40 -04:00
Nick Mathewson 8a0f530adf Add a pair of warnings about only editing CI in 035 2020-08-11 10:44:32 -04:00
Nick Mathewson ffe240951e Merge branch 'maint-0.4.3' into release-0.4.3 2020-08-10 19:33:07 -04:00
Nick Mathewson f3fcc89d05 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-10 19:33:06 -04:00
Nick Mathewson 68f8250cbb Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-10 19:32:49 -04:00
Nick Mathewson e873c7e893 small code tweaks to try to work around debian stable complaints 2020-08-10 19:20:05 -04:00
Nick Mathewson 057f40f3d8 Try to set up a minimal gitlab CI script 
This is based on @eighthave's templates, and the work we've been
doing to present a uniform testing environment.
 2020-08-10 19:20:05 -04:00
Nick Mathewson cb027b392f Add a shareable continuous-integration script. 
Eventually this should be used by every one of our CI scripts.
 2020-08-10 19:01:05 -04:00
Nick Mathewson 44546aeb3f Merge branch 'maint-0.4.3' into release-0.4.3 2020-08-06 13:24:12 -04:00
Nick Mathewson 39d5e7c764 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-08-06 13:24:11 -04:00
Nick Mathewson 352991c843 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-08-06 13:24:11 -04:00
Nick Mathewson bac8967e24 Copy from master gitlab-ci.yml from master back to maint-0.3.5 2020-08-06 12:42:14 -04:00
Alexander Færøy f67d5b39a4 Merge branch 'maint-0.4.3' into release-0.4.3 2020-07-31 02:03:35 +00:00
Alexander Færøy e78a7450a2 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-07-31 02:03:34 +00:00
Alexander Færøy 4e684c8695 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-07-31 02:03:34 +00:00