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,867 Commits 53 Branches 631 Tags
bfcfeaed0772cd9238c3fa4d1c4a6db4f23ad2a3
Commit Graph

28867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson bfcfeaed07 Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4 2018-07-02 13:22:07 -04:00
Nick Mathewson cf8c3abff1 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-07-01 10:22:21 -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 e042727cf0 Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4 2018-06-30 09:15:34 -04:00
Nick Mathewson 72ee0b6f79 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-29 23:12:03 -04:00
Nick Mathewson 3808e3015a Merge branch 'maint-0.3.3' into maint-0.3.4 2018-06-29 23:12:03 -04:00
Nick Mathewson 3c97b148a4 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-29 23:12:03 -04:00
Nick Mathewson 2968c716d7 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-06-29 23:11:47 -04:00
Nick Mathewson 1953a7e61d Finally remove our EOL@EOF check. 
This check was added by mistake long ago.  It will be nice to see
these EOLs disappear from our code over time.

(backport from master)
 2018-06-29 23:11:02 -04:00
Nick Mathewson 8093a63f95 Restor EOL@EOF in routerlist.c 2018-06-29 23:08:45 -04:00
Nick Mathewson 36c372581f Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-29 13:49:43 -04:00
Nick Mathewson ed84dab8b4 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-29 13:49:43 -04:00
Nick Mathewson a3ec89a4f8 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-06-29 13:49:43 -04:00
Nick Mathewson 75a6e7e256 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-06-29 13:49:43 -04:00
Nick Mathewson 3c0a63c40f Fix a memory error in test_shared_random 
Bug not in any released Tor.
 2018-06-29 13:49:02 -04:00
Nick Mathewson d583459d58 Fix some memory errors in the recent coverity fixes. 
Found by asan on travis :/
 2018-06-29 13:48:36 -04:00
Nick Mathewson 92b4996b23 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-29 13:07:13 -04:00
Nick Mathewson d3ecb3a8d6 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-06-29 13:07:13 -04:00
Nick Mathewson 6e9d5fc4ec Merge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2 2018-06-29 13:07:07 -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 f82f8179e6 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-29 13:06:15 -04:00
Nick Mathewson f6b30a97a9 Merge branch 'maint-0.3.3' into maint-0.3.4 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 b89a66e997 Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1 2018-06-29 13:06:11 -04:00
Nick Mathewson 419077c26d Merge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1 2018-06-29 13:06:08 -04:00
Nick Mathewson 890bc15ab6 Changes file for 26467 2018-06-29 13:04:29 -04:00
Nick Mathewson 5ab23e03fa Merge branch 'maint-0.3.3' into maint-0.3.4 2018-06-29 13:02:56 -04:00
Nick Mathewson df896ed632 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-29 13:00:56 -04:00
Nick Mathewson fe2588a5a8 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-29 13:00:56 -04:00
Nick Mathewson 1385a5118d Merge branch 'maint-0.2.9' into maint-0.3.1 2018-06-29 13:00:56 -04:00
Nick Mathewson b426e83f07 Merge remote-tracking branch 'ahf-github/maint-0.2.9' into maint-0.2.9 2018-06-29 13:00:52 -04:00
Alex Xu (Hello71) 614a78ddaa Fix Rust cross compilation. 2018-06-27 14:42:06 -05: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 c08102ea77 Merge branch 'maint-0.3.3' into maint-0.3.4 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 cf0597c3b2 Bump version to 0.3.4.3-alpha-dev 2018-06-26 09:12:23 -04:00
Nick Mathewson 6c836b9e8c Bump to 0.3.4.3-alpha. 2018-06-25 14:07:23 -04:00
Nick Mathewson d85fbc9a58 Add some casts to get test_dir.c compiling on windows. 
Fixed bug 26479.  Bug introduced by 0a6f4627a4292e4; bug not in any
released version.
 2018-06-24 14:06:39 -04:00
Nick Mathewson 3cc0a145bd Fix test_geoip failures on windows by writing file in binary mode. 
Fixes bug 26480; bug appeared when we re-enabled the geoip tests on
windows.  Bug originally introduced by our fix to 25787; bug not in
any released Tor.
 2018-06-24 14:06:05 -04:00
Alexander Færøy 8ec6b36dca Fix memory leak in test_sr_setup_commits(). 
This patch fixes a memory leak in test_sr_setup_commits() where the
place_holder is allocated, but never freed again.

See: Coverity CID 1437440.
 2018-06-23 13:11:03 +02:00
Alexander Færøy 3395de51a0 Fix memory leak in disk_state_parse_commits(). 
This patch fixes a memory leak in disk_state_parse_commits() where if
commit is NULL, we continue the internal loop, but without ever freeing
the args variable.

See: Coverity CID 1437441.
 2018-06-23 13:10:57 +02:00
Alexander Færøy dcbfee246f Fix memory leak in frac_nodes_with_descriptors(). 
This patch fixes a memory leak in frac_nodes_with_descriptors() where
we might return without free'ing the bandwidths variable.

See: Coverity CID 1437451.
 2018-06-23 13:10:29 +02:00
Alexander Færøy a2e623f631 Fix memory leak in helper_add_hsdir_to_networkstatus(). 
This patch fixes a memory leak in helper_add_hsdir_to_networkstatus()
where the rs object might not get properly freed.

See: Coverity CID 1437427.
 2018-06-23 13:07:56 +02:00
Alexander Færøy 8e805bf0f6 Fix memory leak in new_establish_intro_cell(). 
This patch fixes a memory leak in new_establish_intro_cell() that could
happen if a test assertion fails and the *cell_out value isn't properly
free'd.

See: Coverity CID 1437445
 2018-06-23 13:07:56 +02:00
Alexander Færøy 8550016e6f Fix memory leak in test_channelpadding_consensus(). 
The relay variable is always allocated, but might not be freed before we
return from this function.

See: Coverity CID 1437431
 2018-06-23 12:52:04 +02:00
Alexander Færøy c997d49ad6 Fix memory link in test_link_specifier(). 
This patch fixes a memory leak in test_link_specifier() where ls might
not get freed in case one of the test macros fails.

See: Coverity CID 1437434.
 2018-06-23 12:39:20 +02:00
Alexander Færøy 3d80c086be Fix memory leak in decode_link_specifiers(). 
This patch fixes a memory leak in decode_link_specifiers() where the
hs_spec variable might leak if the default label is taken in the
switch/case expression.

See: Coverity CID 1437437.
 2018-06-23 11:54:36 +02:00