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
28,202 Commits 53 Branches 631 Tags
63cddead384d067604f44091e2a8a3f776ccd2bf
Commit Graph

28202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 63cddead38 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-26 09:21:59 -04:00
Nick Mathewson f8dad5a079 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-26 09:21:59 -04:00
Nick Mathewson 25226fb260 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-26 09:21:59 -04:00
Nick Mathewson d6d3f8486d Merge branch 'maint-0.2.9' into maint-0.3.1 2018-06-26 09:21:59 -04:00
Nick Mathewson fcd26af7c0 Merge branch 'feature26372_029' into maint-0.2.9 2018-06-26 09:21:55 -04:00
Nick Mathewson 47ee7978fe Prefer recent Python 3 in autoconf. 
Closes ticket 26372.
 2018-06-21 09:31:01 -04:00
Nick Mathewson 6c38795b7e Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-21 08:54:02 -04:00
Nick Mathewson 8b108935b2 Fix changes file for memory leak. 2018-06-21 08:53:37 -04:00
Nick Mathewson 156e9723bf Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-21 08:36:48 -04:00
Roger Dingledine 7b1a3c5164 fix memory leak in protover.c 
Fix a memory leak where directory authorities would leak a chunk of
memory for every router descriptor every time they considered voting.

This bug was taking down directory authorities in the live network due
to out-of-memory issues.

Fixes bug 26435; bugfix on 0.3.3.6.
 2018-06-20 19:43:58 -04:00
Nick Mathewson 6107a2127b Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-17 19:24:48 -04:00
Nick Mathewson 340fcc7e2e Merge branch 'maint-0.2.9' into maint-0.3.1 2018-06-17 19:24:48 -04:00
Nick Mathewson 8a6e2d5da5 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-17 19:24:48 -04:00
Nick Mathewson a360bf287d Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-17 19:24:48 -04:00
juga0 dd69e74e3f Add .editorconfig to follow coding standards style 2018-06-17 19:24:40 -04:00
Nick Mathewson c134ccfac6 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-16 13:10:19 -04:00
Nick Mathewson ccf1eb3164 Fix a bug in my fix for #26258 
The fix here is use a different bourne shell subsitution for
CARGO_ONLINE, so that an empty string counts as set.
 2018-06-16 13:08:40 -04:00
Nick Mathewson 6ea38c4b55 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-14 12:50:32 -04:00
Nick Mathewson 71065201dd Merge remote-tracking branch 'public/bug26258_033' into maint-0.3.3 2018-06-14 12:47:09 -04:00
Nick Mathewson ee860b8f37 squash! Make sure that the test_rust.sh script fails when a test fails 
Also make sure that we're actually running the test from within the right
cwd, like we do when we're building.  This seems necessary to avoid
an error when running offline.

Amusingly, it appears that we had this bug before: we just weren't
noticing it, because of bug 26258.
 2018-06-13 12:21:25 -04:00
Nick Mathewson 7e7585d0a1 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-13 09:59:28 -04:00
Nick Mathewson 8e99967521 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-13 09:59:28 -04:00
Nick Mathewson ca6d289c00 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-13 09:59:28 -04:00
Nick Mathewson 9713ecfc40 Fix an extra space in a changes file 2018-06-13 09:59:26 -04:00
Nick Mathewson c7d2671f78 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-13 09:58:05 -04:00
Nick Mathewson 049ba66746 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-13 09:58:05 -04:00
Nick Mathewson 6017447e3a Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-13 09:58:04 -04:00
Nick Mathewson 94f3007627 Merge branch 'bug26158_031' into maint-0.3.1 2018-06-13 09:58:01 -04:00
Nick Mathewson 2e71f3ccfe Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-13 09:57:10 -04:00
Nick Mathewson 1c80eb92fa Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-13 09:57:10 -04:00
Nick Mathewson ff70cc84f8 Merge branch 'bug25686_diagnostic_032' into maint-0.3.2 2018-06-13 09:56:17 -04:00
Nick Mathewson bc5d904237 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-12 12:05:32 -04:00
Nick Mathewson bbbb5f39be bump to 0.3.3.7-dev 2018-06-12 12:05:09 -04:00
Nick Mathewson 035a35178c Fold in changelog entry. tor-0.3.3.7 2018-06-12 09:47:25 -04:00
Nick Mathewson 16381b579e Merge branch 'maint-0.2.9' into maint-0.3.1 2018-06-12 09:44:17 -04:00
Nick Mathewson 53513e4bfe Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-12 09:44:17 -04:00
Nick Mathewson eaa359650c Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-12 09:44:17 -04:00
Nick Mathewson ce959b9424 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-12 09:44:17 -04:00
Nick Mathewson ef671147f2 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 2018-06-12 09:44:13 -04:00
Linus Nordberg 2ef448da2f Add a changelog entry. 2018-06-12 09:44:01 -04:00
Linus Nordberg 6cf9288518 Add IPv6 orport address for dannenberg. 2018-06-12 09:44:01 -04:00
Nick Mathewson ef0b19aec6 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-12 08:57:37 -04:00
Nick Mathewson f2e7570c75 Bump to 0.3.3.7 2018-06-12 08:57:09 -04:00
Nick Mathewson 7b7b817c3e changelog for 0.3.3.7 2018-06-12 08:56:05 -04:00
Nick Mathewson 5d8a927aa3 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-12 08:18:56 -04:00
Nick Mathewson 7fff99110b Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-12 08:18:56 -04:00
Nick Mathewson 9ff769c492 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-12 08:18:56 -04:00
Nick Mathewson d84581a3e6 Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1 2018-06-12 08:18:53 -04:00
Nick Mathewson 74ac463e7f Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-12 08:11:20 -04:00
Nick Mathewson 6dca180ae9 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-12 08:11:20 -04:00