]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agorust: abort on panic in all profiles
cypherpunks [Sat, 18 Aug 2018 19:18:48 +0000 (19:18 +0000)] 
rust: abort on panic in all profiles

Until https://github.com/rust-lang/rust/issues/52652 is fixed,
unwinding on panic is potentially unsound in a mixed C/Rust codebase.

The codebase is supposed to be panic-free already, but just to be safe.

This started mattering at commit d1820c1516a31a149fc51a9e5126bf899e4c4e08.

Fixes #27199; bugfix on tor-0.3.3.1-alpha.

7 years agoMerge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3
Nick Mathewson [Fri, 17 Aug 2018 13:38:08 +0000 (09:38 -0400)] 
Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3

7 years agorust/protover: don't accept whitespace in ProtoSet::from_str()
cypherpunks [Fri, 17 Aug 2018 03:22:47 +0000 (03:22 +0000)] 
rust/protover: don't accept whitespace in ProtoSet::from_str()

It's impossible for spaces to get here, since spaces are used as
separators between individual protocol entries higher up.

And it shouldn't ignore whitespace that isn't a literal space
character, because that would differ from the C implementation.

These were added in 9925d2e68709aa7346f4c5bc98ea1349df6741f3.

Fixes #27177. Bugfix on 0.3.3.5-rc.

7 years agorust/protover: fix hyphen parsing bug in ProtoSet::from_str()
cypherpunks [Tue, 7 Aug 2018 00:45:33 +0000 (00:45 +0000)] 
rust/protover: fix hyphen parsing bug in ProtoSet::from_str()

It was parsing "1-2-3" as if it were 1-2, ignoring the 2nd hyphen
and everything after.

Introduced in d1820c1516a31a149fc51a9e5126bf899e4c4e08.

Fixes #27164; bugfix on 0.3.3.1-alpha.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 16 Aug 2018 12:37:11 +0000 (08:37 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoKeep descriptor rotation time after HUP occurs.
George Kadianakis [Sat, 28 Jul 2018 15:31:46 +0000 (17:31 +0200)] 
Keep descriptor rotation time after HUP occurs.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 16 Aug 2018 12:35:27 +0000 (08:35 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoRust: Say that we support rust stable in GettingStartedRust.md
teor [Thu, 16 Aug 2018 08:58:47 +0000 (18:58 +1000)] 
Rust: Say that we support rust stable in GettingStartedRust.md

In 24765, we said that we supported rust stable in CodingStandardsRust.md.
But we left GettingStartedRust.md saying that we support rust nightly.

Closes 27160.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 15 Aug 2018 16:20:57 +0000 (12:20 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 15 Aug 2018 16:20:57 +0000 (12:20 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
Nick Mathewson [Wed, 15 Aug 2018 16:20:53 +0000 (12:20 -0400)] 
Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9

7 years agoMerge remote-tracking branch 'public/bug26779_033' into maint-0.3.3
Nick Mathewson [Wed, 15 Aug 2018 06:16:19 +0000 (02:16 -0400)] 
Merge remote-tracking branch 'public/bug26779_033' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 9 Aug 2018 12:47:25 +0000 (08:47 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Thu, 9 Aug 2018 12:47:24 +0000 (08:47 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoUpdate geoip and geoip6 to the August 7 2018 database.
Karsten Loesing [Thu, 9 Aug 2018 07:44:38 +0000 (09:44 +0200)] 
Update geoip and geoip6 to the August 7 2018 database.

7 years agoMerge branch 'bug26948_033' into maint-0.3.3
Nick Mathewson [Wed, 8 Aug 2018 22:06:11 +0000 (18:06 -0400)] 
Merge branch 'bug26948_033' into maint-0.3.3

7 years agoDetect broken stdatomic.h, and pretend that it isn't there at all
Nick Mathewson [Wed, 8 Aug 2018 19:41:40 +0000 (15:41 -0400)] 
Detect broken stdatomic.h, and pretend that it isn't there at all

I hope that the debian clang maintainers will look at debian bug
903709 soon. But until they do, this should keep our users and our
CI happy on sid with clang.

Closes ticket 26779.

7 years agoDon't search for -lpthread on Windows
Nick Mathewson [Wed, 8 Aug 2018 13:56:51 +0000 (09:56 -0400)] 
Don't search for -lpthread on Windows

If we're building for Windows, we want to use windows threads no
matter what, and we don't want to link a pthread library even if it
is present.  Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 8 Aug 2018 13:26:23 +0000 (09:26 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 8 Aug 2018 13:26:22 +0000 (09:26 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoChanges file for 25440
Nick Mathewson [Wed, 8 Aug 2018 13:26:21 +0000 (09:26 -0400)] 
Changes file for 25440

7 years agoFix crash when calling openat with sandbox enabled #25440
Daniel Pinto [Tue, 17 Apr 2018 00:31:49 +0000 (01:31 +0100)] 
Fix crash when calling openat with sandbox enabled #25440

The seccomp rule for the openat syscall checks for the AT_FDCWD
constant. Because this constant is usually a negative value, a
cast to unsigned int is necessary to make sure it does not get
converted to uint64_t used by seccomp.

More info on:
https://github.com/seccomp/libseccomp/issues/69#issuecomment-273805980

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 3 Aug 2018 11:33:45 +0000 (07:33 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Fri, 3 Aug 2018 11:33:45 +0000 (07:33 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'fix_nonstandard_malloc_029' into maint-0.2.9
Nick Mathewson [Fri, 3 Aug 2018 11:33:39 +0000 (07:33 -0400)] 
Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9

7 years agoFix build on GNU/Hurd. Patch from paulusASol. Closes 26873.
Nick Mathewson [Wed, 1 Aug 2018 18:37:03 +0000 (14:37 -0400)] 
Fix build on GNU/Hurd. Patch from paulusASol. Closes 26873.

7 years agoAlways call tor_free_all() when exiting tor_run_main()
Nick Mathewson [Tue, 31 Jul 2018 12:41:27 +0000 (08:41 -0400)] 
Always call tor_free_all() when exiting tor_run_main()

We would usually call it through tor_cleanup(), but in some code
paths, we wouldn't. These paths would break restart-in-process,
since leaving fields uncleared would cause assertion failures on
restart.

Fixes bug 26948; bugfix on 0.3.3.1-alpha

7 years agoMerge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3
Nick Mathewson [Tue, 31 Jul 2018 12:29:54 +0000 (08:29 -0400)] 
Merge remote-tracking branch 'teor/bug26876_033' into maint-0.3.3

7 years agoMerge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3
Nick Mathewson [Mon, 30 Jul 2018 13:01:45 +0000 (09:01 -0400)] 
Merge remote-tracking branch 'teor/bug26627_033' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 30 Jul 2018 12:45:01 +0000 (08:45 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2
Nick Mathewson [Mon, 30 Jul 2018 12:44:40 +0000 (08:44 -0400)] 
Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 30 Jul 2018 12:17:24 +0000 (08:17 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoDon't disable an unsupported compiler warning
Taylor Yu [Thu, 26 Jul 2018 17:32:34 +0000 (12:32 -0500)] 
Don't disable an unsupported compiler warning

Conditionalize the pragma that temporarily disables
-Wunused-const-variable.  Some versions of gcc don't support it.  We
need to do this because of an apparent bug in some libzstd headers.
Fixes bug 26785; bugfix on 0.3.2.11.

7 years agoImprove connection auth logging
teor [Wed, 25 Jul 2018 04:39:31 +0000 (14:39 +1000)] 
Improve connection auth logging

Improve the log message when connection initiators fail to authenticate
direct connections to relays.

Fixes bug 26927; bugfix on 0.3.0.1-alpha.

7 years agoMerge branch 'bug26924_029' into bug26924_032
teor [Wed, 25 Jul 2018 04:33:10 +0000 (14:33 +1000)] 
Merge branch 'bug26924_029' into bug26924_032

7 years agoStop logging link auth warnings on Single Onion Services and Tor2web
teor [Wed, 25 Jul 2018 04:28:06 +0000 (14:28 +1000)] 
Stop logging link auth warnings on Single Onion Services and Tor2web

Instead, log a protocol warning when single onion services or
Tor2web clients fail to authenticate direct connections to relays.

Fixes bug 26924; bugfix on 0.2.9.1-alpha.

7 years agoStop putting unsupported ed25519 link auth in v3 onion service descs
teor [Tue, 24 Jul 2018 08:22:41 +0000 (18:22 +1000)] 
Stop putting unsupported ed25519 link auth in v3 onion service descs

Stop putting ed25519 link specifiers in v3 onion service descriptors,
when the intro point doesn't support ed25519 link authentication.

Fixes bug 26627; bugfix on 0.3.2.4-alpha.

7 years agoStop sending unsupported ed25519 link specifiers in v3 introduce cells
teor [Fri, 6 Jul 2018 06:06:44 +0000 (16:06 +1000)] 
Stop sending unsupported ed25519 link specifiers in v3 introduce cells

Stop sending ed25519 link specifiers in v3 onion service introduce
cells, when the rendezvous point doesn't support ed25519 link
authentication.

Fixes bug 26627; bugfix on 0.3.2.4-alpha.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 20 Jul 2018 14:42:29 +0000 (10:42 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'ticket26647_032' into maint-0.3.2
Nick Mathewson [Fri, 20 Jul 2018 14:42:23 +0000 (10:42 -0400)] 
Merge branch 'ticket26647_032' into maint-0.3.2

7 years agoIgnore mach_approximate_time when targeting macOS 10.9 and earlier
teor [Fri, 20 Jul 2018 02:26:33 +0000 (12:26 +1000)] 
Ignore mach_approximate_time when targeting macOS 10.9 and earlier

Work around two different bugs in the OS X 10.10 and later SDKs that would
prevent us from successfully targeting earlier versions of OS X.

Fixes bug 26876; bugfix on 0.3.3.1-alpha.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 19 Jul 2018 12:31:07 +0000 (08:31 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
Nick Mathewson [Thu, 19 Jul 2018 12:30:59 +0000 (08:30 -0400)] 
Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 18 Jul 2018 20:39:25 +0000 (16:39 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 18 Jul 2018 20:39:25 +0000 (16:39 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoChanges file for bug 26787
Nick Mathewson [Wed, 18 Jul 2018 20:39:22 +0000 (16:39 -0400)] 
Changes file for bug 26787

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 18 Jul 2018 20:39:10 +0000 (16:39 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 18 Jul 2018 20:39:10 +0000 (16:39 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoTry putting ulimit -c 0 in test_bt.sh to see if it fixes bug 26787
Nick Mathewson [Mon, 16 Jul 2018 11:53:43 +0000 (07:53 -0400)] 
Try putting ulimit -c 0 in test_bt.sh to see if it fixes bug 26787

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Wed, 18 Jul 2018 19:04:14 +0000 (15:04 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Wed, 18 Jul 2018 19:03:27 +0000 (15:03 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'bug26485_029_squashed' into maint-0.2.9
Nick Mathewson [Wed, 18 Jul 2018 19:01:03 +0000 (15:01 -0400)] 
Merge branch 'bug26485_029_squashed' into maint-0.2.9

7 years agoAdd a test for format_recommended_version_list.
Nick Mathewson [Tue, 17 Jul 2018 19:39:31 +0000 (15:39 -0400)] 
Add a test for format_recommended_version_list.

7 years agoWarn when an authority has voted for a version with a space in it.
Nick Mathewson [Wed, 11 Jul 2018 15:24:55 +0000 (11:24 -0400)] 
Warn when an authority has voted for a version with a space in it.

Another way to try to prevent a recurrence of 26485.

7 years agoWarn the directory authority operator if their versions list is bogus
Nick Mathewson [Wed, 11 Jul 2018 15:14:48 +0000 (11:14 -0400)] 
Warn the directory authority operator if their versions list is bogus

Prevents bug 26485; bugfix on 0.1.1.6-alpha.

7 years agoSKIP test_key_expiration.sh on Windows until the underlying issue is resolved
teor [Wed, 18 Jul 2018 02:37:12 +0000 (12:37 +1000)] 
SKIP test_key_expiration.sh on Windows until the underlying issue is resolved

Skip an unreliable key expiration test on Windows, until the underlying
issue in bug 26076 is resolved.

Fixes bug 26853; bugfix on 0.3.2.1-alpha.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 17 Jul 2018 18:56:52 +0000 (14:56 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Tue, 17 Jul 2018 18:56:52 +0000 (14:56 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoSKIP test_keygen.sh on Windows until the underlying issue is resolved
teor [Tue, 17 Jul 2018 01:24:02 +0000 (11:24 +1000)] 
SKIP test_keygen.sh on Windows until the underlying issue is resolved

Skip an unreliable key generation test on Windows, until the underlying
issue in bug 26076 is resolved.

Fixes bug 26830; bugfix on 0.2.7.3-rc.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Thu, 12 Jul 2018 18:32:16 +0000 (14:32 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Thu, 12 Jul 2018 18:32:16 +0000 (14:32 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoput new bridge auth Serge into place
Roger Dingledine [Thu, 12 Jul 2018 18:12:13 +0000 (14:12 -0400)] 
put new bridge auth Serge into place

The "Bifroest" bridge authority has been retired; the new bridge authority
is "Serge", and it is operated by George from the TorBSD project.

Closes ticket 26771.

7 years agoWhen setting a nonstandard malloc, disable the system malloc.
Nick Mathewson [Wed, 11 Jul 2018 13:36:24 +0000 (09:36 -0400)] 
When setting a nonstandard malloc, disable the system malloc.

Closes ticket 20424.

7 years agoAdd controller support for listing ExtORPort and HTTPTunnelPorts
Nick Mathewson [Tue, 10 Jul 2018 14:50:43 +0000 (10:50 -0400)] 
Add controller support for listing ExtORPort and HTTPTunnelPorts

Closes ticket 26647.

7 years agoBump to 0.3.3.8-dev.
Nick Mathewson [Mon, 9 Jul 2018 19:17:16 +0000 (15:17 -0400)] 
Bump to 0.3.3.8-dev.

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 9 Jul 2018 14:17:20 +0000 (10:17 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'github/bug26269_031' into maint-0.3.2
Nick Mathewson [Mon, 9 Jul 2018 14:17:17 +0000 (10:17 -0400)] 
Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 9 Jul 2018 14:14:43 +0000 (10:14 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Mon, 9 Jul 2018 14:14:43 +0000 (10:14 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'bug26269_029' into maint-0.2.9
Nick Mathewson [Mon, 9 Jul 2018 14:14:39 +0000 (10:14 -0400)] 
Merge branch 'bug26269_029' into maint-0.2.9

7 years agoBump to 0.3.3.8
Nick Mathewson [Mon, 9 Jul 2018 13:24:07 +0000 (09:24 -0400)] 
Bump to 0.3.3.8

7 years agoClear all control.c flags on control_free_all()
Nick Mathewson [Fri, 23 Mar 2018 15:31:56 +0000 (11:31 -0400)] 
Clear all control.c flags on control_free_all()

Fixes bug 25512.

(Cherry-picked from 3519d0c8086ede

7 years agoMerge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3
Nick Mathewson [Mon, 9 Jul 2018 13:13:58 +0000 (09:13 -0400)] 
Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Mon, 9 Jul 2018 13:11:41 +0000 (09:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 9 Jul 2018 13:11:41 +0000 (09:11 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3
Nick Mathewson [Mon, 9 Jul 2018 13:08:58 +0000 (09:08 -0400)] 
Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3

7 years agoUpdate geoip and geoip6 to the July 3 2018 database.
Karsten Loesing [Fri, 6 Jul 2018 18:54:03 +0000 (20:54 +0200)] 
Update geoip and geoip6 to the July 3 2018 database.

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.2
Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'bug26535_032' into maint-0.3.2
Nick Mathewson [Tue, 3 Jul 2018 13:48:00 +0000 (09:48 -0400)] 
Merge branch 'bug26535_032' into maint-0.3.2

7 years agoMerge branch 'bug26535_029' into maint-0.2.9
Nick Mathewson [Tue, 3 Jul 2018 13:47:41 +0000 (09:47 -0400)] 
Merge branch 'bug26535_029' into maint-0.2.9

7 years agohs_ntor_ref.py: pass only strings to subprocess.Popen
Nick Mathewson [Mon, 2 Jul 2018 18:04:46 +0000 (14:04 -0400)] 
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.

7 years agontor_ref.py: pass only strings to subprocess.Popen
Nick Mathewson [Mon, 2 Jul 2018 18:04:46 +0000 (14:04 -0400)] 
ntor_ref.py: pass only strings to subprocess.Popen

Recent Python3 versions seem to require this on Windows.

Fixes bug 26535; bug introduced in f4be34f70d6f277a0f3f73e, which
was apparently intended itself as a Python3 workaround.

7 years agoMerge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3
Nick Mathewson [Sun, 1 Jul 2018 14:22:18 +0000 (10:22 -0400)] 
Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1 maint-0.3.1
Nick Mathewson [Sat, 30 Jun 2018 03:11:47 +0000 (23:11 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoFinally remove our EOL@EOF check.
Nick Mathewson [Mon, 18 Jun 2018 20:10:47 +0000 (16:10 -0400)] 
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)

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoFix a memory error in test_shared_random
Nick Mathewson [Fri, 29 Jun 2018 17:49:02 +0000 (13:49 -0400)] 
Fix a memory error in test_shared_random

Bug not in any released Tor.

7 years agoFix some memory errors in the recent coverity fixes.
Nick Mathewson [Fri, 29 Jun 2018 17:48:36 +0000 (13:48 -0400)] 
Fix some memory errors in the recent coverity fixes.

Found by asan on travis :/

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 29 Jun 2018 17:07:13 +0000 (13:07 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2
Nick Mathewson [Fri, 29 Jun 2018 17:07:07 +0000 (13:07 -0400)] 
Merge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Fri, 29 Jun 2018 17:06:15 +0000 (13:06 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Fri, 29 Jun 2018 17:06:15 +0000 (13:06 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 29 Jun 2018 17:06:15 +0000 (13:06 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1
Nick Mathewson [Fri, 29 Jun 2018 17:06:11 +0000 (13:06 -0400)] 
Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1

7 years agoMerge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1
Nick Mathewson [Fri, 29 Jun 2018 17:06:08 +0000 (13:06 -0400)] 
Merge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1