nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,632 Commits 53 Branches 630 Tags 125 MiB
bcba6a4918
Commit Graph

30632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
bcba6a4918 Merge branch 'maint-0.3.5' 2018-11-06 15:17:52 -05:00
Nick Mathewson
67abf55d6b Add a changes file for bug 28303 2018-11-06 15:17:19 -05:00
Kris Katterjohn
daaa2751ed Include sys/time.h in timers.c and time_fmt.c 
This fixes compilation on OpenBSD.

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
 2018-11-06 15:15:22 -05:00
Nick Mathewson
17d8ccefc0 Merge branch 'bug28348_036' 2018-11-06 09:18:01 -05:00
Nick Mathewson
313b5b956c Merge branch 'maint-0.3.5' 2018-11-06 09:16:25 -05:00
Nick Mathewson
c32dab9e48 Merge branch 'bug28348_035' into bug28348_036 2018-11-06 07:43:27 -05:00
Nick Mathewson
9431d35074 Merge branch 'bug28348_034' into bug28348_035 2018-11-06 07:42:55 -05:00
Nick Mathewson
2aff02eb3d Actually disable NEED_NET periodic events when DisableNetwork is set 
Fixes bug 28348; bugfix on 0.3.4.1-alpha
 2018-11-06 07:40:02 -05:00
Nick Mathewson
674ef53a7e Add a warning if we can't write networkstatus-bridges 
Fixes CID 1440818.
 2018-11-02 13:32:43 -04:00
Nick Mathewson
18a4eaf5c1 Avoid mmap leak if we get a consensus diff we can't use. 
Fixes CID 1440819; bug not in any released Tor.
 2018-11-02 13:30:55 -04:00
Nick Mathewson
3e2423d19b Update address tests to avoid offending coverity. 2018-11-02 13:29:24 -04:00
Nick Mathewson
865514e66e Merge branch 'ticket28100_squashed' 2018-11-02 13:19:24 -04:00
Alex Xu (Hello71)
1b75de85b3 Don't overwrite the Content-Type when compressing 2018-11-02 13:19:14 -04:00
Nick Mathewson
f0bd6c2c9d Merge branch 'maint-0.3.5' 2018-11-02 13:14:37 -04:00
Nick Mathewson
996f24fcd3 Merge branch 'bug27968_squashed' into maint-0.3.5 2018-11-02 13:14:32 -04:00
teor
e36e4a9671 Sort the imports in test_rebind.py 
Cleanup after #27968.
 2018-11-02 13:14:23 -04:00
teor
a02d6c560d Make test_rebind.py timeout when waiting for a log message 
Closes #27968.
 2018-11-02 13:14:23 -04:00
teor
cd674a10ad Refactor test_rebind.py to consistently print FAIL on failure 
Part of #27968.
 2018-11-02 13:14:23 -04:00
teor
8f43b8fb47 Avoid a race condition in test_rebind.py 
If tor terminates due to SIGNAL HALT before test_rebind.py calls
tor_process.terminate(), an OSError 3 (no such process) is thrown.

Fixes part of bug 27968 on 0.3.5.1-alpha.
 2018-11-02 13:14:23 -04:00
Nick Mathewson
f27279f857 Merge remote-tracking branch 'tor-github/pr/449' 2018-11-02 13:11:26 -04:00
Nick Mathewson
d671e3f513 Merge remote-tracking branch 'tor-github/pr/448' 2018-11-02 13:09:45 -04:00
Nick Mathewson
3d8fcbcbad Merge branch 'maint-0.3.5' 2018-11-02 13:02:02 -04:00
Nick Mathewson
0ea508ec6f Merge branch 'maint-0.3.4' into maint-0.3.5 
"ours" merge to avoid version bump.
 2018-11-02 13:01:53 -04:00
Nick Mathewson
5acf6f8717 Bump to 0.3.4.9-dev 2018-11-02 13:01:32 -04:00
Nick Mathewson
339ff694a7 Merge branch 'maint-0.3.5' 2018-11-02 11:29:00 -04:00
Nick Mathewson
3c691613c6 forward-port 0.3.4.9 changelog and releasenotes 2018-11-02 11:28:57 -04:00
Nick Mathewson
f57fd0318a Merge remote-tracking branch 'tor-github/pr/397' 2018-11-02 10:01:26 -04:00
Nick Mathewson
2ac24b503b Merge branch 'maint-0.3.5' 2018-11-02 09:39:16 -04:00
Nick Mathewson
a6c7e01584 Merge branch 'bug27963_wallclock' into maint-0.3.5 2018-11-02 09:39:13 -04:00
Nick Mathewson
084a5a13c7 Merge branch 'bug27963_wallclock' 2018-11-02 09:38:26 -04:00
Nick Mathewson
be197339ba Merge branch 'maint-0.3.5' 2018-11-02 09:09:01 -04:00
Nick Mathewson
ff05162710 Merge branch 'maint-0.3.4' into maint-0.3.5 
"ours" to avoid version bump.
 2018-11-02 09:08:53 -04:00
Nick Mathewson
d8d4fe83d0 Bump to 0.3.4.9 2018-11-02 09:08:45 -04:00
Nick Mathewson
b71f93f532 Merge branch 'maint-0.3.5' 2018-11-02 09:06:38 -04:00
Nick Mathewson
bbdf56aed6 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-11-02 09:06:38 -04:00
Nick Mathewson
bfe8f50cc8 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-02 09:06:37 -04:00
Nick Mathewson
6bd069630a Merge branch 'bug26470_032' into maint-0.3.3 2018-11-02 09:06:32 -04:00
Nick Mathewson
a0ab950bfa Merge branch 'maint-0.3.5' 2018-11-02 09:05:18 -04:00
Nick Mathewson
a3fc93b8dd Merge branch 'maint-0.3.4' into maint-0.3.5 2018-11-02 09:05:18 -04:00
Nick Mathewson
f288f2478a Merge branch 'bug26896_034' into maint-0.3.4 2018-11-02 09:05:14 -04:00
Nick Mathewson
5ac0e9113b Merge branch 'maint-0.3.5' 2018-11-02 09:04:25 -04:00
Nick Mathewson
d409565e38 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-11-02 09:04:25 -04:00
Nick Mathewson
8ed4f1ee84 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-11-02 09:04:25 -04:00
Nick Mathewson
e847909b71 Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3 2018-11-02 09:04:20 -04:00
George Kadianakis
a0402c6f33 Add changes file for #27707. 2018-11-01 12:40:52 +02:00
Fernando Fernandez Mancera
f60607ee96 Improve log message in hs_service.c 
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
 2018-11-01 12:40:52 +02:00
Nick Mathewson
383b44553c Merge branch 'ticket24393_036_01_squashed' 2018-10-31 11:07:15 -04:00
Neel Chauhan
e9adc200aa Add test for nodes_in_same_family() 2018-10-31 11:07:03 -04:00
Nick Mathewson
0d124488f8 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-10-31 11:02:58 -04:00
Nick Mathewson
a2e034d7d9 Merge branch 'maint-0.3.5' 2018-10-31 11:02:58 -04:00