59c3910bec
Merge branch 'tor-github/pr/695'
2019-02-20 12:15:26 -05:00
d259194c82
Merge branch 'tor-github/pr/658'
2019-02-20 12:09:52 -05:00
da179088ee
Merge branch 'tor-github/pr/687'
2019-02-20 12:09:02 -05:00
7037fe1163
Merge branch 'tor-github/pr/700'
2019-02-20 12:06:39 -05:00
b7ad8bcaad
Use setrlimit instead of ulimit -c in backtrace tests
2019-02-20 12:06:26 -05:00
8f5a3c0460
Merge branch 'tor-github/pr/675'
2019-02-20 11:45:58 -05:00
a30f17f72f
Merge branch 'tor-github/pr/696'
2019-02-20 11:29:55 -05:00
4d4eda89a1
Merge branch 'maint-0.4.0'
2019-02-20 10:36:54 -05:00
249319ec5d
fix typos from #28614
2019-02-20 10:32:47 -05:00
6927e9a60c
Merge remote-tracking branch 'tor-github/pr/665'
2019-02-19 11:56:48 -05:00
0fc5fdc430
Merge remote-tracking branch 'tor-github/pr/659'
2019-02-19 11:55:53 -05:00
97e1539f7f
Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0
2019-02-19 11:53:02 -05:00
c3fca4e4b3
Merge branch 'maint-0.4.0'
2019-02-19 11:51:24 -05:00
4df31adef7
Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0
2019-02-19 11:51:19 -05:00
f70929347f
Merge branch 'maint-0.4.0'
2019-02-19 11:49:24 -05:00
4bc55ed5ee
Merge branch 'bug29145_029' into maint-0.4.0
2019-02-19 11:49:20 -05:00
4417ac880a
Fix a compiler warning on OpenBSD
...
malloc_options needs to be declared extern (and declaring it extern
means we need to initialize it separately)
Fixes bug 29145; bugfix on 0.2.9.3-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-02-19 11:38:32 -05:00
af36af1a9b
Merge remote-tracking branch 'tor-github/pr/683'
2019-02-19 11:32:33 -05:00
1239e411a7
Merge remote-tracking branch 'tor-github/pr/694'
2019-02-19 11:31:22 -05:00
0db0b4769c
Merge remote-tracking branch 'tor-github/pr/678'
2019-02-19 11:30:27 -05:00
26873bc4ed
Merge branch 'bug28698_035' into maint-0.4.0
2019-02-19 11:27:18 -05:00
78220aae1e
Add circuit time check before logging about relaxing circuit time
...
Signed-off-by: José M. Guisado <guigom@riseup.net >
2019-02-19 11:24:51 -05:00
5c87add923
Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0
2019-02-19 11:21:51 -05:00
6fdd34acd6
Remove check-tor script
2019-02-15 19:18:24 +02:00
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
00b073b1bc
Merge branch 'maint-0.3.5'
2019-02-14 18:01:07 +02:00
d83c299eba
Merge branch 'tor-github/pr/689' into maint-0.3.5
2019-02-14 18:00:05 +02:00
9bfe4ed6dd
Merge branch 'tor-github/pr/536' into maint-0.3.5
2019-02-14 17:39:34 +02:00
f5a6d4c6ea
Disable unstable circuit padding unittest.
...
until #29298 is implemented.
2019-02-14 12:09:41 +02:00
5f42bc0f48
Merge remote-tracking branch 'tor-github/pr/699'
2019-02-13 15:19:59 -05:00
5687165cf1
Merge remote-tracking branch 'tor-github/pr/674'
2019-02-13 11:38:35 -05:00
d5de1a0a55
Merge branch 'tor-github/pr/651'
2019-02-13 11:02:02 -05:00
6efc2a0e1f
Merge branch 'tor-github/pr/650' into maint-0.3.5
2019-02-13 10:56:24 -05:00
b61c3c6dfa
changes: Add changes file for #26698
2019-02-13 12:26:00 +00:00
c320c52e89
Merge branch 'tor-github/pr/690'
2019-02-12 13:04:25 -05:00
95e5f8fe03
Merge branch 'tor-github/pr/671'
2019-02-12 13:02:30 -05:00
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
a797a69679
Merge branch 'maint-0.3.5'
2019-02-12 09:56:50 -05:00
2e770216c4
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-12 09:56:49 -05:00
db209d4dba
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-12 09:56:49 -05:00
7ead2af622
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-12 09:56:49 -05:00
a3f9ddcf03
Update geoip and geoip6 to the February 5 2019 database.
2019-02-12 14:40:42 +01:00
8d04dc416b
Add changes file
2019-02-09 16:56:54 +02:00
f4c76661d1
Add a script to check for coverage nondeterminism
...
Closes ticket 29436.
2019-02-08 11:22:24 -05:00
f2b646a2b6
Merge branch 'ticket29435_035' into ticket29435_040
2019-02-08 10:47:04 -05:00
192b312c97
Fix coverage script.
...
It was looking for object files made with the old automake
directorations, but those changed when we split up our libraries.
Fixes bug 29435; bugfix on 0.3.5.1-alpha.
2019-02-08 10:43:38 -05:00
b53fee4622
Fix SC2086 warning in test_workqueue_*.sh shell scripts
2019-02-08 16:51:49 +02:00
b63404ebba
Changes file for ticket29026.
2019-02-08 08:52:46 -05:00
7f59b9fb1f
Merge branch 'maint-0.3.5'
2019-02-08 08:37:46 -05:00
ab65347819
Merge branch 'ticket29040_1_changes' into maint-0.3.5
2019-02-08 08:37:43 -05:00
David Goulet
rl1987
Roger Dingledine
Nick Mathewson
Kris Katterjohn
José M. Guisado
Matt Traudt
George Kadianakis
juga0
Karsten Loesing