git.ipfire.org Git - thirdparty/tor.git/log

commit | commitdiff | tree

Nick Mathewson [Mon, 30 Jul 2018 12:17:25 +0000 (08:17 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Mon, 30 Jul 2018 12:17:24 +0000 (08:17 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

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.

commit | commitdiff | tree

Nick Mathewson [Fri, 20 Jul 2018 14:42:29 +0000 (10:42 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Fri, 20 Jul 2018 14:42:29 +0000 (10:42 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Fri, 20 Jul 2018 14:42:23 +0000 (10:42 -0400)]

Merge branch 'ticket26647_032' into maint-0.3.2

commit | commitdiff | tree

Nick Mathewson [Thu, 19 Jul 2018 18:33:18 +0000 (14:33 -0400)]

Fix linking when dirauth module is disabled.

Bugfix on dcee4d4c9cc7d98e5ae8e913c73a3afc41753c64, bug not in any
released Tor.

commit | commitdiff | tree

Nick Mathewson [Thu, 19 Jul 2018 12:31:07 +0000 (08:31 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Thu, 19 Jul 2018 12:31:07 +0000 (08:31 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

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

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 20:39:25 +0000 (16:39 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 20:39:25 +0000 (16:39 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 20:39:25 +0000 (16:39 -0400)]

Merge branch 'maint-0.2.9' into maint-0.3.2

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 20:39:22 +0000 (16:39 -0400)]

Changes file for bug 26787

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 20:39:10 +0000 (16:39 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 20:39:10 +0000 (16:39 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 20:39:10 +0000 (16:39 -0400)]

Merge branch 'maint-0.2.9' into maint-0.3.2

commit | commitdiff | tree

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

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 19:08:57 +0000 (15:08 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 19:04:14 +0000 (15:04 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 19:03:27 +0000 (15:03 -0400)]

Merge branch 'maint-0.2.9' into maint-0.3.2

commit | commitdiff | tree

Nick Mathewson [Wed, 18 Jul 2018 19:01:03 +0000 (15:01 -0400)]

Merge branch 'bug26485_029_squashed' into maint-0.2.9

commit | commitdiff | tree

Nick Mathewson [Tue, 17 Jul 2018 19:39:31 +0000 (15:39 -0400)]

Add a test for format_recommended_version_list.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Nick Mathewson [Tue, 17 Jul 2018 18:56:52 +0000 (14:56 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Tue, 17 Jul 2018 18:56:52 +0000 (14:56 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Tue, 17 Jul 2018 18:56:52 +0000 (14:56 -0400)]

Merge branch 'maint-0.2.9' into maint-0.3.2

commit | commitdiff | tree

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.

commit | commitdiff | tree

rl1987 [Mon, 16 Jul 2018 10:49:40 +0000 (10:49 +0000)]

Fix build to work with --disable-unittests again

commit | commitdiff | tree

Nick Mathewson [Thu, 12 Jul 2018 18:32:16 +0000 (14:32 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Thu, 12 Jul 2018 18:32:16 +0000 (14:32 -0400)]

Merge branch 'maint-0.2.9' into maint-0.3.2

commit | commitdiff | tree

Nick Mathewson [Thu, 12 Jul 2018 18:32:16 +0000 (14:32 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

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.

commit | commitdiff | tree

Nick Mathewson [Tue, 10 Jul 2018 14:50:43 +0000 (10:50 -0400)]

Add controller support for listing ExtORPort and HTTPTunnelPorts

Closes ticket 26647.

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 19:17:48 +0000 (15:17 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" to avoid version bump.

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 19:17:38 +0000 (15:17 -0400)]

Bump to 0.3.4.4-rc-dev

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 19:17:16 +0000 (15:17 -0400)]

Bump to 0.3.3.8-dev.

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 14:17:20 +0000 (10:17 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 14:17:20 +0000 (10:17 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

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

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 14:15:16 +0000 (10:15 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 14:14:43 +0000 (10:14 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 14:14:43 +0000 (10:14 -0400)]

Merge branch 'maint-0.2.9' into maint-0.3.2

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 14:14:39 +0000 (10:14 -0400)]

Merge branch 'bug26269_029' into maint-0.2.9

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 13:24:14 +0000 (09:24 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" merge to avoid version bump

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 13:24:07 +0000 (09:24 -0400)]

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 13:23:39 +0000 (09:23 -0400)]

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 13:21:46 +0000 (09:21 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

"ours" merge to avoid cherry-picked copy of #25512 fix, which is already in
this branch.

commit | commitdiff | tree

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

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 13:14:37 +0000 (09:14 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

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

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 13:11:41 +0000 (09:11 -0400)]

Merge branch 'maint-0.2.9' into maint-0.3.2

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 13:11:41 +0000 (09:11 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 13:11:41 +0000 (09:11 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Mon, 9 Jul 2018 13:09:01 +0000 (09:09 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

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

commit | commitdiff | tree

Karsten Loesing [Fri, 6 Jul 2018 18:54:03 +0000 (20:54 +0200)]

Update geoip and geoip6 to the July 3 2018 database.

commit | commitdiff | tree

Nick Mathewson [Tue, 3 Jul 2018 17:16:37 +0000 (13:16 -0400)]

Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)]

Merge branch 'maint-0.2.9' into maint-0.3.2

commit | commitdiff | tree

Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Tue, 3 Jul 2018 13:48:03 +0000 (09:48 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Tue, 3 Jul 2018 13:48:00 +0000 (09:48 -0400)]

Merge branch 'bug26535_032' into maint-0.3.2

commit | commitdiff | tree

Nick Mathewson [Tue, 3 Jul 2018 13:47:41 +0000 (09:47 -0400)]

Merge branch 'bug26535_029' into maint-0.2.9

commit | commitdiff | tree

Nick Mathewson [Mon, 2 Jul 2018 20:11:02 +0000 (16:11 -0400)]

Partially revert "Use tor_addr_from_getsockname() in several places"

This reverts part of commit 6ed384b827dce21ea3a44b587, in order to
fix bug 26568. Bugfix on 0.3.4.1-alpha.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Nick Mathewson [Mon, 2 Jul 2018 17:38:40 +0000 (13:38 -0400)]

Merge remote-tracking branch 'catalyst-github/bug26449_034' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Mon, 2 Jul 2018 17:22:07 +0000 (13:22 -0400)]

Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Sun, 1 Jul 2018 14:22:21 +0000 (10:22 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

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

commit | commitdiff | tree

Nick Mathewson [Sat, 30 Jun 2018 13:15:34 +0000 (09:15 -0400)]

Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)]

Merge branch 'maint-0.3.1' into maint-0.3.2

commit | commitdiff | tree

Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Sat, 30 Jun 2018 03:12:03 +0000 (23:12 -0400)]

Merge branch 'maint-0.3.3' into maint-0.3.4

commit | commitdiff | tree

Nick Mathewson [Sat, 30 Jun 2018 03:11:47 +0000 (23:11 -0400)]

Merge branch 'maint-0.2.9' into maint-0.3.1

commit | commitdiff | tree

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)

commit | commitdiff | tree

Nick Mathewson [Sat, 30 Jun 2018 03:08:45 +0000 (23:08 -0400)]

Restor EOL@EOF in routerlist.c

commit | commitdiff | tree

Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)]

Merge branch 'maint-0.3.1' into maint-0.3.2

commit | commitdiff | tree

Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)]

Merge branch 'maint-0.3.2' into maint-0.3.3

commit | commitdiff | tree

Nick Mathewson [Fri, 29 Jun 2018 17:49:43 +0000 (13:49 -0400)]

Merge branch 'maint-0.2.9' into maint-0.3.1