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
27,407 Commits 53 Branches 631 Tags
d79557efc4a6ad77c14206d4a02fdacfdbf3d83f
Commit Graph
27407 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 c04c495406 Merge branch 'maint-0.3.2' into release-0.3.2 2018-07-18 16:39:10 -04:00
Nick Mathewson 78386d8cdd Merge branch 'maint-0.2.9' into maint-0.3.2 2018-07-18 16:39:10 -04:00
Nick Mathewson 501deba8cf Try putting ulimit -c 0 in test_bt.sh to see if it fixes bug 26787 2018-07-18 16:33:48 -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 fd5dce0a1b Add a test for format_recommended_version_list. 2018-07-18 15:00:53 -04:00
Nick Mathewson 8ee1fe7aa7 Warn when an authority has voted for a version with a space in it. 
Another way to try to prevent a recurrence of 26485.
 2018-07-18 15:00:53 -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 8747627d8a bump to 0.3.2.11-dev now that the release is out 2018-07-13 17:00:22 -04:00
Roger Dingledine ea3ecb98bd bump to 0.3.2.11 for release tor-0.3.2.11 2018-07-12 20:26:00 -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 e3e6335a08 Add controller support for listing ExtORPort and HTTPTunnelPorts 
Closes ticket 26647.
 2018-07-10 10:50:43 -04:00
Nick Mathewson 67af36397d Merge branch 'maint-0.3.2' into release-0.3.2 2018-07-09 10:17:20 -04:00
Nick Mathewson 6ad2c2b92f Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2 2018-07-09 10:17:17 -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 e6366f787c Merge branch 'bug26535_032' into maint-0.3.2 2018-07-03 09:48:00 -04:00
Nick Mathewson b205714ba8 Merge branch 'bug26535_029' into maint-0.2.9 2018-07-03 09:47:41 -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 855b27b9e7 Merge branch 'maint-0.3.2' into release-0.3.2 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 71bcba4704 Merge branch 'maint-0.3.2' into release-0.3.2 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