Nick Mathewson
8683c56532
Merge branch 'maint-0.3.2' into release-0.3.2
2018-08-15 12:20:57 -04:00
Nick Mathewson
a26a2735b9
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-15 12:20:57 -04:00
Nick Mathewson
4c355ff185
Merge remote-tracking branch 'github/bug27081_029' into maint-0.2.9
2018-08-15 12:20:53 -04:00
Nick Mathewson
882f69eb0a
Merge branch 'maint-0.3.2' into release-0.3.2
2018-08-09 08:47:25 -04:00
Nick Mathewson
8982719f6a
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-09 08:47:24 -04:00
Karsten Loesing
fe19b40fe9
Update geoip and geoip6 to the August 7 2018 database.
2018-08-09 09:44:38 +02:00
Nick Mathewson
7a570b8182
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 1790dc6760
2018-08-08 09:56:51 -04:00
Nick Mathewson
21da46f697
Merge branch 'maint-0.3.2' into release-0.3.2
2018-08-08 09:26:23 -04:00
Nick Mathewson
8e68fe7e1c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-08 09:26:22 -04:00
Nick Mathewson
27a2a6cb9b
Changes file for 25440
2018-08-08 09:26:21 -04:00
Nick Mathewson
920a7b37a5
Merge branch 'maint-0.3.2' into release-0.3.2
2018-08-03 07:33:45 -04:00
Nick Mathewson
4856a6e6c4
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-03 07:33:45 -04:00
Nick Mathewson
42c6ebda16
Merge branch 'fix_nonstandard_malloc_029' into maint-0.2.9
2018-08-03 07:33:39 -04:00
Nick Mathewson
edfa746888
Merge branch 'maint-0.3.2' into release-0.3.2
2018-07-30 08:45:01 -04:00
Nick Mathewson
fea35ddf00
Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2
2018-07-30 08:44:40 -04:00
Nick Mathewson
d79557efc4
Merge branch 'maint-0.3.2' into release-0.3.2
2018-07-30 08:17:24 -04:00
Taylor Yu
a8bdb851eb
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.
2018-07-26 12:32:34 -05:00
teor
859d5a7375
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.
2018-07-25 14:39:31 +10:00
teor
fdc3ad6259
Merge branch 'bug26924_029' into bug26924_032
2018-07-25 14:33:10 +10:00
teor
6443812e34
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.
2018-07-25 14:30:33 +10:00
Nick Mathewson
8edbeb26bb
Merge branch 'maint-0.3.2' into release-0.3.2
2018-07-20 10:42:29 -04:00
Nick Mathewson
be3a962ca7
Merge branch 'ticket26647_032' into maint-0.3.2
2018-07-20 10:42:23 -04:00
Nick Mathewson
94871f75d7
Merge branch 'maint-0.3.2' into release-0.3.2
2018-07-19 08:31:07 -04:00
Nick Mathewson
209332e71a
Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
2018-07-19 08:30:59 -04:00
Nick Mathewson
02e1e8a51a
Merge branch 'maint-0.3.2' into release-0.3.2
2018-07-18 16:39:25 -04:00
Nick Mathewson
312a42fc85
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 16:39:25 -04:00
Nick Mathewson
93da2cae49
Changes file for bug 26787
2018-07-18 16:39:22 -04:00
Nick Mathewson
4d052b611b
Merge branch 'maint-0.3.2' into release-0.3.2
2018-07-18 15:03:35 -04:00
Nick Mathewson
559f79fd79
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 15:03:27 -04:00
Nick Mathewson
a321d72401
Merge branch 'bug26485_029_squashed' into maint-0.2.9
2018-07-18 15:01:03 -04:00
Nick Mathewson
dcee4d4c9c
Warn the directory authority operator if their versions list is bogus
...
Prevents bug 26485; bugfix on 0.1.1.6-alpha.
2018-07-18 15:00:53 -04:00
teor
449d190e2e
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.
2018-07-18 12:37:12 +10:00
Nick Mathewson
8a49a44111
Merge branch 'maint-0.3.2' into release-0.3.2
2018-07-17 14:56:52 -04:00
Nick Mathewson
61a2762e35
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-17 14:56:52 -04:00
teor
6dafddd05d
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.
2018-07-17 14:56:18 -04:00
Roger Dingledine
079c6cce5e
fold changes into 0.3.2.11
2018-07-12 20:19:07 -04:00
Nick Mathewson
98ee23ca1e
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-12 14:32:16 -04:00
Nick Mathewson
160629d4a7
Merge branch 'maint-0.3.2' into release-0.3.2
2018-07-12 14:32:16 -04:00
Roger Dingledine
cd4795ca3e
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.
2018-07-12 14:12:13 -04:00
Nick Mathewson
16bdbddc2c
When setting a nonstandard malloc, disable the system malloc.
...
Closes ticket 20424.
2018-07-11 09:37:29 -04:00
Nick Mathewson
e3e6335a08
Add controller support for listing ExtORPort and HTTPTunnelPorts
...
Closes ticket 26647.
2018-07-10 10:50:43 -04:00
Nick Mathewson
bc9bc9304a
Merge branch 'maint-0.3.2' into release-0.3.2
2018-07-09 10:14:43 -04:00
Nick Mathewson
4a604d9938
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-09 10:14:43 -04:00
Nick Mathewson
8b53dfc362
Merge branch 'bug26269_029' into maint-0.2.9
2018-07-09 10:14:39 -04:00
Nick Mathewson
1e4cc366d5
Merge branch 'maint-0.3.2' into release-0.3.2
2018-07-09 09:11:41 -04:00
Nick Mathewson
d3894dc34b
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-09 09:11:41 -04:00
Karsten Loesing
9faa28b60e
Update geoip and geoip6 to the July 3 2018 database.
2018-07-06 20:54:03 +02:00
Nick Mathewson
f141d34799
Merge branch 'maint-0.3.2' into release-0.3.2
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
