Nick Mathewson
7d8290f0ac
Merge remote-tracking branch 'tor-gitlab/mr/183' into master
2020-11-12 08:47:05 -05:00
Nick Mathewson
dde6b8906f
Merge branch 'maint-0.4.4' into master
...
"ours" to avoid version bump.
2020-11-12 08:13:26 -05:00
Nick Mathewson
3f1544bbd9
Bump to 0.4.4.6-dev
2020-11-12 08:13:07 -05:00
Nick Mathewson
09b4c73fe4
Merge branch 'maint-0.4.3' into maint-0.4.4
...
"ours" to avoid version bump.
2020-11-12 08:12:20 -05:00
Nick Mathewson
fd22fa183b
Bump to 0.4.3.7-dev
2020-11-12 08:12:11 -05:00
Nick Mathewson
1fa90a2077
Merge branch 'maint-0.3.5' into maint-0.4.3
...
"ours" to avoid version bump.
2020-11-12 08:11:20 -05:00
Nick Mathewson
862c44e4ec
Bump to 0.3.5.12-dev
2020-11-12 08:11:01 -05:00
Nick Mathewson
4806aa5da8
Copy ChangeLog and ReleaseNotes from today's releases to master branch
2020-11-12 07:37:25 -05:00
Nick Mathewson
9306ac5aa8
changes file for bug 40172.
2020-11-10 17:29:37 -05:00
Matthew Finkel
d8f9a5da5d
Export RANLIB so it's available in combine_libs script
...
Fixes 40172; bugfix on 0.4.5.1-alpha
2020-11-10 22:07:34 +00:00
Nick Mathewson
bc6c37b202
Merge branch 'maint-0.4.4' into master
...
"-s ours" to avoid version bump.
2020-11-09 17:14:01 -05:00
Nick Mathewson
494ced690d
Merge branch 'maint-0.4.3' into maint-0.4.4
...
"-s ours" to avoid version bump.
2020-11-09 17:13:41 -05:00
Nick Mathewson
3d3dc08ed8
Merge branch 'maint-0.3.5' into maint-0.4.3
...
"-s ours" to avoid version bump.
2020-11-09 17:13:25 -05:00
Nick Mathewson
210a94b231
Bump to 0.4.4.6
2020-11-09 17:13:02 -05:00
Nick Mathewson
6338c35e9d
Bump to 0.4.3.7
2020-11-09 17:12:41 -05:00
Nick Mathewson
665083be9f
Bump to 0.3.5.12
2020-11-09 17:12:18 -05:00
Nick Mathewson
113d18dc57
Merge branch 'maint-0.4.4' into master
2020-11-09 16:17:50 -05:00
Nick Mathewson
ec0f000445
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-11-09 16:17:42 -05:00
Nick Mathewson
0b2c64effd
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-11-09 16:13:42 -05:00
Nick Mathewson
52e439c13e
Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5
2020-11-09 16:13:24 -05:00
Alexander Færøy
faa96f9a8e
Merge remote-tracking branch 'tor-gitlab/mr/193'
2020-11-09 14:15:07 +00:00
Alexander Færøy
0702cf10db
Merge remote-tracking branch 'tor-gitlab/mr/192'
2020-11-09 14:15:03 +00:00
Alexander Færøy
5e65a746aa
Merge remote-tracking branch 'tor-gitlab/mr/190'
2020-11-09 14:12:45 +00:00
George Kadianakis
dd119b277b
Merge remote-tracking branch 'tor-gitlab/mr/185' into master
2020-11-03 16:06:12 +02:00
David Goulet
486ddde2c4
configure: Check STAP_PROBEV macro when building with USDT tracing
...
It turns out that STAP_PROBEV() is not available on FreeBSD thus having
sdt/sdt.h is not enough. Look for it now at configure time.
Closes #40174
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-11-03 09:05:53 -05:00
David Goulet
31d542a9c6
ci: Add DISTCHECK to tracing test on Gitlab
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-11-03 08:36:02 -05:00
George Kadianakis
4f5a116618
Merge remote-tracking branch 'tor-gitlab/mr/187' into master
2020-11-03 13:04:09 +02:00
David Goulet
474369e3fa
Merge branch 'tor-gitlab/mr/186'
2020-11-02 13:14:02 -05:00
David Goulet
8b240fbe40
Merge branch 'tor-gitlab/mr/188'
2020-11-02 13:09:15 -05:00
David Goulet
dc6438b549
or: Missing .inc file in include.am
...
Fixes #40173
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-11-02 08:25:48 -05:00
Nick Mathewson
7a75a1064f
Fix another duplicate typedef.
...
Fixes #40177 ; bugfix on 0.4.5.1-alpha.
2020-11-02 07:15:10 -05:00
Nick Mathewson
aa85284038
Update to 0.4.5.1-alpha-dev
2020-11-01 16:41:56 -05:00
Nick Mathewson
2667971336
rewrap changelog
2020-11-01 16:21:25 -05:00
Nick Mathewson
1fd058059c
Edits on ChangeLog from seborn.
2020-11-01 11:46:08 -05:00
Daniel Pinto
f3b9be4422
Implement WIN32 tor_cond_wait using condition variables #30187
...
Fix bug where running a relay on Windows would use 100% CPU
after some time. Makes Windows >= Vista the required Windows
version to build and run tor.
2020-11-01 03:10:25 +00:00
Nick Mathewson
6e25c49f76
Full round of edits on ChangeLog
2020-10-30 11:48:41 -04:00
Nick Mathewson
e01f586e05
Bump version to 0.4.5.1-alpha
2020-10-30 11:05:22 -04:00
Nick Mathewson
013550d645
Sorting and editing on the changelog.
2020-10-30 11:04:38 -04:00
Nick Mathewson
4c165aca04
Run format_changelog
2020-10-30 10:59:14 -04:00
Nick Mathewson
e6d3836d96
Minor edits to changelog headers
2020-10-30 10:58:57 -04:00
Nick Mathewson
7e56f80376
Start a changelog for 0.4.5.1-alpha.
2020-10-30 10:57:21 -04:00
Nick Mathewson
148b5b03a3
Merge branch 'bug40080_035'
2020-10-30 10:51:20 -04:00
George Kadianakis
54e6109499
Merge remote-tracking branch 'tor-gitlab/mr/174' into master
2020-10-30 14:14:14 +02:00
Nick Mathewson
df16376004
Fix duplicate typedef in metrics_store_entry.h
...
Fixes #40171 . Bug not in any released Tor.
2020-10-28 16:36:14 -04:00
Nick Mathewson
f7d0bde4f0
Remove "GETINFO network-status".
...
It was deprecated 0.3.1.1-alpha.
According to #22473 , nothing uses it.
Closes #22473 .
2020-10-28 11:48:23 -04:00
Alexander Færøy
b0e6ec627c
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-10-28 15:39:37 +00:00
Alexander Færøy
4876409c2a
Merge branch 'maint-0.3.5' into maint-0.4.3
2020-10-28 15:39:37 +00:00
Alexander Færøy
03be7de168
Merge branch 'maint-0.4.4'
2020-10-28 15:39:37 +00:00
Nick Mathewson
3f442987f1
Log a warning if Tor was built with any "risky" compile-time options
...
These options are meant for testing builds only, and are likely to
cause trouble if used in a production environment.
Closes #18888 .
2020-10-28 11:34:30 -04:00
Alexander Færøy
c37d05d0c6
Merge remote-tracking branch 'tor-gitlab/mr/171'
2020-10-28 15:15:39 +00:00
