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

28283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roger Dingledine e946147b77 bump to 0.3.3.9 for release 2018-07-12 20:25:26 -04:00
Roger Dingledine 5521729da9 fold changes into 0.3.3.9 2018-07-12 20:24:54 -04:00
Nick Mathewson dbfe8a42a4 Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-12 14:32:16 -04:00
Nick Mathewson 710188f84e Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-12 14:32:16 -04:00
Nick Mathewson 98ee23ca1e Merge branch 'maint-0.2.9' into maint-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 81b5483ee6 Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-09 15:18:09 -04:00
Nick Mathewson f5e3bcb60b Bump to 0.3.3.8-dev. 2018-07-09 15:17:16 -04:00
Nick Mathewson 99f9816efa Build a changelog and releasenotes for 0.3.3.8 tor-0.3.3.8 2018-07-09 10:54:10 -04:00
Nick Mathewson 250e0fc1c4 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-09 10:17:20 -04:00
Nick Mathewson 059f638a12 Merge branch 'maint-0.3.3' into release-0.3.3 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 69918629f5 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-09 10:14:43 -04:00
Nick Mathewson 4e4d2ed864 Merge branch 'maint-0.3.3' into release-0.3.3 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 2f3b9151ec Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-09 09:24:48 -04:00
Nick Mathewson 532873a924 Bump to 0.3.3.8 2018-07-09 09:24:07 -04:00
Nick Mathewson 92b3fc9317 Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-09 09:22:13 -04:00
Nick Mathewson a95cfb8a58 Clear all control.c flags on control_free_all() 
Fixes bug 25512.

(Cherry-picked from 3519d0c808
 2018-07-09 09:20:45 -04:00
Nick Mathewson 04ce541f88 Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-09 09:14:03 -04:00
Nick Mathewson f721a08220 Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3 2018-07-09 09:13:58 -04:00
Nick Mathewson d3894dc34b Merge branch 'maint-0.2.9' into maint-0.3.2 2018-07-09 09:11:41 -04:00
Nick Mathewson adbe261f22 Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-09 09:11:41 -04:00
Nick Mathewson 451a84cecb Merge branch 'maint-0.3.2' into maint-0.3.3 2018-07-09 09:11:41 -04:00
Nick Mathewson 0b8760a880 Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-09 09:09:01 -04:00
Nick Mathewson fead22fb2a Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3 2018-07-09 09:08:58 -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 a4e8f94507 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-07-03 09:48:03 -04:00
Nick Mathewson b489e8cfea Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-03 09:48:03 -04:00
Nick Mathewson 4c094436c5 Merge branch 'maint-0.3.2' into maint-0.3.3 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 b22b60365f Merge branch 'maint-0.3.3' into release-0.3.3 2018-07-01 10:22:20 -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 3c97b148a4 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-29 23:12:03 -04:00
Nick Mathewson 103076a759 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-29 23:12:03 -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 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 ed84dab8b4 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-29 13:49:43 -04:00
Nick Mathewson a814ed0192 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-29 13:49:43 -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 a3ec89a4f8 Merge branch 'maint-0.2.9' into maint-0.3.1 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 739cd6ec20 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-29 13:07:13 -04:00
Nick Mathewson 92b4996b23 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-29 13:07:13 -04:00