Nick Mathewson
ba8d71d9c3
Merge remote-tracking branch 'tor-github/pr/1774/head'
2020-03-05 09:10:24 -05:00
Nick Mathewson
7177eeddf1
Merge branch 'maint-0.4.3'
2020-03-05 08:48:40 -05:00
Roger Dingledine
29542ccdcc
Remove surprising empty line in info-level cbt log
...
Fixes bug 33531; bugfix on 0.3.3.1-alpha.
2020-03-04 13:45:34 -05:00
George Kadianakis
edc0bf5089
Merge branch 'tor-github/pr/1763'
2020-03-03 14:35:31 +02:00
Nick Mathewson
c705c8cf1b
changes file for 33436
2020-03-03 14:35:01 +02:00
Nick Mathewson
87e0873056
changes file for ticket 33460.
2020-02-26 14:19:53 -05:00
Nick Mathewson
11adf0f46f
Merge remote-tracking branch 'tor-github/pr/1750/head'
2020-02-25 12:58:23 -05:00
Nick Mathewson
b6d9484fa7
Merge remote-tracking branch 'tor-github/pr/1761/head'
2020-02-24 08:06:42 -05:00
Nick Mathewson
d4d5d9d1d1
Merge branch 'ticket33316_squashed'
2020-02-24 07:49:45 -05:00
Nick Mathewson
0c18c94bb1
extend ticket33316 changes file to include more changes
2020-02-24 07:49:39 -05:00
Nick Mathewson
67d921a696
Changes file for ticket 33316
2020-02-24 07:49:39 -05:00
Nick Mathewson
caa392a73a
Merge remote-tracking branch 'tor-github/pr/1685/head'
2020-02-24 07:45:20 -05:00
George Kadianakis
93cb8072be
Final touches to #32709 based on Nick's feedback.
...
- Fix a bug and add unittest.
- Add changes file.
- Add man page entry.
2020-02-24 12:15:35 +02:00
Taylor Yu
7160a7218d
changes file for ticket 33369
2020-02-20 17:13:02 -06:00
Nick Mathewson
7ba7f9c0de
Merge branch 'maint-0.4.3'
2020-02-20 10:44:43 -05:00
Nick Mathewson
7b42502869
Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3
2020-02-20 10:44:36 -05:00
Nick Mathewson
626eb025b6
Merge remote-tracking branch 'tor-github/pr/1745/head'
2020-02-20 09:14:40 -05:00
Nick Mathewson
09fb7987c5
Merge branch 'maint-0.4.3'
2020-02-20 08:50:18 -05:00
Nick Mathewson
f733b8acd6
Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3
2020-02-20 08:48:17 -05:00
Nick Mathewson
b9cc4cc50a
Merge branch 'ticket4631_squashed'
2020-02-20 08:17:47 -05:00
Nick Mathewson
a65efa7e83
Merge branch 'extract_relay_dns'
2020-02-19 13:58:53 -05:00
Nick Mathewson
65b75ef3d5
Merge branch 'extract_ext_orport'
2020-02-19 13:55:18 -05:00
Nick Mathewson
7b6e81f8e6
Merge branch 'extract_selftest'
2020-02-19 11:58:17 -05:00
Nick Mathewson
dca2c00aca
Merge remote-tracking branch 'tor-github/pr/1755/head'
2020-02-19 11:39:05 -05:00
teor
4dd594d33c
Merge remote-tracking branch 'tor-github/pr/1744'
2020-02-19 10:09:29 +10:00
teor
57ff8d4a53
practracker: Read unicode files when using Python 2
...
Allow the "practracker" coding best practices checking script to read
unicode files, when using Python 2.
We made the script use unicode literals in 0.4.3.1-alpha, but didn't
change the codec for opening files.
Fixes bug 33374; bugfix on 0.4.3.1-alpha.
2020-02-19 08:22:01 +10:00
Taylor Yu
5164709f90
changes file for ticket 33275
2020-02-18 13:34:46 -06:00
David Goulet
f0561861e3
Merge branch 'tor-github/pr/1746'
2020-02-18 13:57:03 -05:00
Steven Engler
9a68eca3a7
Small changes to scheduler comments and state changes
...
Tries to make some of the comments in scheduler.c easier to follow,
and simplifies a couple of the scheduler channel state changes.
2020-02-18 13:56:58 -05:00
Nick Mathewson
e85f46b7be
Do not build selftest.c when running relay mode is disabled.
2020-02-18 13:31:33 -05:00
Nick Mathewson
a1a3a4d585
Make ext_orport.c relay-mode-only.
2020-02-18 13:23:50 -05:00
Nick Mathewson
c43a245292
Disable dns.c when relay mode is disabled.
...
This saves about 1% for me on a binary compiled without relay mode.
Closes ticket 33366.
2020-02-18 12:46:10 -05:00
Nick Mathewson
93af83e16a
Remember dirctory bw usage, and log it in the heartbeat
...
Closes ticket 32720.
2020-02-18 11:25:18 -05:00
David Goulet
17724a7cde
Merge branch 'tor-github/pr/1743'
2020-02-18 09:06:13 -05:00
David Goulet
f24959df1d
Merge branch 'tor-github/pr/1740'
2020-02-18 08:46:52 -05:00
teor
e540a4147f
changes: file for 4631
2020-02-18 13:23:30 +10:00
teor
d71090f8e3
Travis: Produce detailed chutney diagnostics
...
When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
to produce detailed diagnostic output.
Closes ticket 32792.
2020-02-17 17:21:13 +10:00
teor
da280a4309
Makefile: Add an IPv6 mixed chutney network
...
This network is used in make test-network-all and test-network-ipv6.
Closes 33334.
2020-02-17 14:55:05 +10:00
teor
f231827946
Merge remote-tracking branch 'tor-github/pr/1731'
2020-02-17 13:49:23 +10:00
teor
334469cc39
Merge branch 'bug33195_master' into ticket33280_master
...
Conflicts:
* Keep the changes from ticket33280_master
2020-02-17 13:46:09 +10:00
Panagiotis Vasilopoulos
674a821fbb
Stop assuming that /usr/bin/python exists
...
Fixes 33192
2020-02-16 21:58:01 +02:00
Taylor Yu
55f088bb29
Script to check sorting of manpage entries
...
Add a script to help check the alphabetical ordering of option names
in a manpage. Closes ticket 33339.
2020-02-14 11:02:16 -06:00
Nick Mathewson
a6509cb867
Merge remote-tracking branch 'tor-github/pr/1727/head'
2020-02-14 08:20:21 -05:00
Nick Mathewson
1ab7c05231
Merge branch 'maint-0.4.3'
2020-02-13 10:47:43 -05:00
Nick Mathewson
baeff46d36
Merge branch 'ticket33290_v2_042' into ticket33290_v2_043
...
Conflicts:
src/core/or/circuitmux_ewma.c
2020-02-13 09:21:47 -05:00
Nick Mathewson
fd1686c7d8
Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
2020-02-13 09:12:48 -05:00
teor
c34c101212
Merge branch 'bug33195_043' into bug33195_master
2020-02-13 14:22:18 +10:00
teor
3e8e4af1ac
Merge branch 'bug33195_042' into bug33195_043
...
Conflicts:
* Keep disable module relay from maint-0.4.3
* Keep doxygen from maint-0.4.3
* Keep the ordering from bug33195_042
2020-02-13 14:21:26 +10:00
teor
f021389e92
Merge branch 'bug33195_041' into bug33195_042
...
Conflicts:
* Keep RUST_VERSION from maint-0.4.2
* Keep the commented-out allow_failure entries from bug33195_041
2020-02-13 13:58:13 +10:00
teor
c96cf14943
Merge branch 'bug33195_035' into bug33195_041
...
Conflicts:
* Keep TOR_TEST_RNG_SEED from maint-0.4.1
* Keep the ordering from bug33195_035
2020-02-13 13:55:55 +10:00
