Matt Traudt
|
b054a6c6b9
|
kist: When readding chans, check correct chan's sched_heap_idx
Closes #29508
Signed-off-by: David Goulet <dgoulet@torproject.org>
|
2019-02-14 16:19:31 -05:00 |
|
George Kadianakis
|
00b073b1bc
|
Merge branch 'maint-0.3.5'
|
2019-02-14 18:01:07 +02:00 |
|
George Kadianakis
|
d83c299eba
|
Merge branch 'tor-github/pr/689' into maint-0.3.5
|
2019-02-14 18:00:05 +02:00 |
|
George Kadianakis
|
9bfe4ed6dd
|
Merge branch 'tor-github/pr/536' into maint-0.3.5
|
2019-02-14 17:39:34 +02:00 |
|
Nick Mathewson
|
5f42bc0f48
|
Merge remote-tracking branch 'tor-github/pr/699'
|
2019-02-13 15:19:59 -05:00 |
|
Nick Mathewson
|
5687165cf1
|
Merge remote-tracking branch 'tor-github/pr/674'
|
2019-02-13 11:38:35 -05:00 |
|
David Goulet
|
d5de1a0a55
|
Merge branch 'tor-github/pr/651'
|
2019-02-13 11:02:02 -05:00 |
|
David Goulet
|
6efc2a0e1f
|
Merge branch 'tor-github/pr/650' into maint-0.3.5
|
2019-02-13 10:56:24 -05:00 |
|
juga0
|
b61c3c6dfa
|
changes: Add changes file for #26698
|
2019-02-13 12:26:00 +00:00 |
|
David Goulet
|
c320c52e89
|
Merge branch 'tor-github/pr/690'
|
2019-02-12 13:04:25 -05:00 |
|
David Goulet
|
95e5f8fe03
|
Merge branch 'tor-github/pr/671'
|
2019-02-12 13:02:30 -05:00 |
|
Nick Mathewson
|
72b978c3a5
|
On windows, if we fail to load a consensus and it has a CRLF, retry.
Fixes bug 28614; bugfix on 0.4.0.1-alpha when we started mmapping
the consensus.
|
2019-02-12 12:57:33 -05:00 |
|
Nick Mathewson
|
a797a69679
|
Merge branch 'maint-0.3.5'
|
2019-02-12 09:56:50 -05:00 |
|
Nick Mathewson
|
2e770216c4
|
Merge branch 'maint-0.3.4' into maint-0.3.5
|
2019-02-12 09:56:49 -05:00 |
|
Nick Mathewson
|
db209d4dba
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2019-02-12 09:56:49 -05:00 |
|
Nick Mathewson
|
7ead2af622
|
Merge branch 'maint-0.2.9' into maint-0.3.3
|
2019-02-12 09:56:49 -05:00 |
|
Karsten Loesing
|
a3f9ddcf03
|
Update geoip and geoip6 to the February 5 2019 database.
|
2019-02-12 14:40:42 +01:00 |
|
Nick Mathewson
|
b63404ebba
|
Changes file for ticket29026.
|
2019-02-08 08:52:46 -05:00 |
|
Nick Mathewson
|
7f59b9fb1f
|
Merge branch 'maint-0.3.5'
|
2019-02-08 08:37:46 -05:00 |
|
Nick Mathewson
|
ab65347819
|
Merge branch 'ticket29040_1_changes' into maint-0.3.5
|
2019-02-08 08:37:43 -05:00 |
|
Nick Mathewson
|
eca0f87801
|
Add changes file for bug 29040.
|
2019-02-08 08:37:23 -05:00 |
|
Nick Mathewson
|
b1ae2fd65b
|
Merge branch 'maint-0.3.5'
|
2019-02-08 08:19:34 -05:00 |
|
Nick Mathewson
|
4b36f9676d
|
Merge remote-tracking branch 'tor-github/pr/670' into maint-0.3.5
|
2019-02-08 08:19:31 -05:00 |
|
Roger Dingledine
|
bfd1d70243
|
Merge branch 'maint-0.3.5'
|
2019-02-05 08:10:43 -05:00 |
|
Roger Dingledine
|
bca25eebfb
|
Merge branch 'maint-0.3.4' into maint-0.3.5
|
2019-02-05 08:10:14 -05:00 |
|
Roger Dingledine
|
8ea98c0f4c
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2019-02-05 08:09:47 -05:00 |
|
Peter Gerber
|
83b1ca9b07
|
Add release note for bug 29150
|
2019-02-02 23:10:16 +00:00 |
|
Nick Mathewson
|
4d7a0a1310
|
Update Cargo.lock with new comment; suppress 29244.
|
2019-02-01 16:38:23 +01:00 |
|
rl1987
|
58cbe51708
|
Use RFC5737-compliant example IP addresses in manpage when describing MapAddress
|
2019-01-30 17:13:40 +02:00 |
|
Nick Mathewson
|
bbd893d6bd
|
Write consensus files in binary mode
This will help us out on windows now that we mmap files. Fixes part
of ticket 28614.
|
2019-01-29 16:18:41 +01:00 |
|
rl1987
|
790150e57a
|
Allow empty username/password in SOCKS5 username/password auth message
|
2019-01-26 11:06:33 +02:00 |
|
Nick Mathewson
|
e19222a0da
|
Use tt_u64_op() in test_circuitpadding.c to fix compilation warnings
Fixes bug 29169.
|
2019-01-24 13:20:21 -05:00 |
|
Nick Mathewson
|
8b254c1c70
|
Merge branch 'precommit_squashed'
|
2019-01-24 11:08:10 -05:00 |
|
rl1987
|
99fffc6c2f
|
Add a pre-commit hook that runs code and changelog entry formatting checks
|
2019-01-24 08:03:17 -05:00 |
|
Nick Mathewson
|
d23704bf26
|
Merge branch 'ticket28668_035' into ticket28668_040
|
2019-01-23 14:50:22 -05:00 |
|
Nick Mathewson
|
6144cf99ad
|
Capture more BUG warnings in util/time test
These are ones that happen on windows only.
Fixes bug 29161.
|
2019-01-23 12:37:12 -05:00 |
|
Nick Mathewson
|
54c9c8b04f
|
If address/get_if_addrs6 can't findipv6, log WARN, not ERR
Fixes 29160, and allows 28668 (treating ERR logs as test failures)
to procede.
|
2019-01-23 12:04:57 -05:00 |
|
Nick Mathewson
|
adeeb8841e
|
Merge branch 'maint-0.3.5'
|
2019-01-23 11:18:14 -05:00 |
|
rl1987
|
712a622fce
|
Log an HSDesc we failed to parse at Debug loglevel
|
2019-01-23 10:37:10 -05:00 |
|
Nick Mathewson
|
dd6c2b0ad7
|
maint-0.2.9: remove changes files that are merged in 0.2.9 releases
Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
|
2019-01-23 09:48:28 -05:00 |
|
Nick Mathewson
|
8e1e71cc0d
|
Merge branch 'bug29122'
|
2019-01-22 14:31:01 -05:00 |
|
George Kadianakis
|
6243133a71
|
Fix intermittent failures of test_circuitpadding_wronghop().
We fix it by disabling the scheduling of actual padding.
Fixes #29122.
|
2019-01-22 14:30:43 -05:00 |
|
Nick Mathewson
|
74e41155ff
|
Merge branch 'maint-0.3.5'
|
2019-01-22 12:27:50 -05:00 |
|
Nick Mathewson
|
d9fde87607
|
correct bug number in 29042 changelog
|
2019-01-22 12:27:46 -05:00 |
|
Nick Mathewson
|
21dd3ece62
|
Merge branch 'maint-0.3.5'
|
2019-01-22 11:55:56 -05:00 |
|
Nick Mathewson
|
4159d103d6
|
Merge branch 'bug29042_035' into maint-0.3.5
|
2019-01-22 11:55:53 -05:00 |
|
Nick Mathewson
|
00bc18b847
|
Merge remote-tracking branch 'tor-github/pr/653'
|
2019-01-22 08:13:14 -05:00 |
|
Nick Mathewson
|
0ce4d23af5
|
Merge branch 'maint-0.3.5'
|
2019-01-22 08:04:55 -05:00 |
|
Nick Mathewson
|
9ce1978b5e
|
Merge branch 'bug28979_035' into maint-0.3.5
|
2019-01-22 08:04:52 -05:00 |
|
Nick Mathewson
|
761f1bf71e
|
Merge branch 'maint-0.3.3' into maint-0.3.4
|
2019-01-18 12:25:08 -05:00 |
|