Commit Graph

6573 Commits

Author SHA1 Message Date
Nick Mathewson b489e8cfea Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-03 09:48:03 -04:00
Nick Mathewson 4c094436c5 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-03 09:48:03 -04:00
Nick Mathewson a4e8f94507 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-07-03 09:48:03 -04:00
Nick Mathewson 3baf3d01cb hs_ntor_ref.py: pass only strings to subprocess.Popen
Recent Python3 versions seem to require this on Windows.

Fixes bug 26535; bug copied from ntor_ref.py on 0.3.1.1-alpha.
2018-07-02 14:23:26 -04:00
Nick Mathewson fc5f8b6931 ntor_ref.py: pass only strings to subprocess.Popen
Recent Python3 versions seem to require this on Windows.

Fixes bug 26535; bug introduced in f4be34f70d, which
was apparently intended itself as a Python3 workaround.
2018-07-02 14:18:41 -04:00
Nick Mathewson b22b60365f Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-01 10:22:20 -04:00
Nick Mathewson 9aeef05f8f Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3 2018-07-01 10:22:18 -04:00
Nick Mathewson 97dfe87be0 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-29 13:06:15 -04:00
Nick Mathewson f82f8179e6 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-29 13:06:15 -04:00
Nick Mathewson 68dfbd5ef4 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-29 13:06:15 -04:00
Nick Mathewson ea14d3408d Merge branch 'maint-0.2.9' into maint-0.3.1 2018-06-29 13:06:15 -04:00
Nick Mathewson 890bc15ab6 Changes file for 26467 2018-06-29 13:04:29 -04:00
David Goulet 3f8a12a63a control: Make HSPOST properly parse HSADDRESS= param
For HSv3, the HSADDRESS= wasn't properly parsed for the HSPOST command. It now
correctly use it and furthermore sends back a "200 OK" in case the command is
successful for a v3 descriptor.

Fixes #26523

Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-06-27 12:25:24 -04:00
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 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 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 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 035a35178c Fold in changelog entry. 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
Linus Nordberg 2ef448da2f Add a changelog entry. 2018-06-12 09:44:01 -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
Nick Mathewson 3cca9a103d Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-12 08:11:20 -04:00
Nick Mathewson 19f3868523 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-06-12 08:11:19 -04:00