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
d1af4d65df
Merge branch 'maint-0.3.5'
2019-01-18 12:25:08 -05:00
Nick Mathewson
a8580a6836
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-18 12:25:08 -05:00
Nick Mathewson
761f1bf71e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-18 12:25:08 -05:00
Nick Mathewson
4cca7fb99b
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-18 12:25:08 -05:00
Nick Mathewson
9d7b4f1ca8
Fix the year for 0.3.4.10 and 0.3.3.11
2019-01-18 10:22:06 -05:00
Nick Mathewson
aaef95ada5
format_changelog: treat "issue NNNN" as a track ticket
2019-01-18 10:15:02 -05:00
Nick Mathewson
67f275f8da
Bump to 0.4.0.1-alpha-dev
2019-01-18 10:08:57 -05:00
Nick Mathewson
81f1b89efc
Better failure message on stochastic test failure
2019-01-17 17:27:13 -05:00
Nick Mathewson
c08fc2e19e
Speed up the deterministic prng in test_prob_distr, by a lot.
...
Using a single xof object and squeezing it repeatedly should make
everything MUCH faster here.
2019-01-17 16:10:02 -05:00
Nick Mathewson
77712a5fa2
Merge remote-tracking branch 'tor-github/pr/645'
2019-01-17 12:04:50 -05:00
Nick Mathewson
7e1f893460
lintChanges.py: Two python re usage fixes
2019-01-17 08:46:06 -05:00
Nick Mathewson
7c6a8c674b
Fix documentation for ClientAuth on HSv3.
...
The manpage erroneously said "privkey" when "public-key" would have
been correct. Reported by "Felixix" as ticket 28979. Bugfix on
0.3.5.1-alpha.
2019-01-16 16:10:20 -05:00
Nick Mathewson
16430fdaf5
Merge branch 'maint-0.3.5'
2019-01-16 14:43:53 -05:00
Kris Katterjohn
f0408b844f
Add changes file for bug 28981
...
The fix was in commit 61636ad989de674698601284957dacde53cc4984.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-16 14:40:31 -05:00
Kris Katterjohn
cbcf75d728
Update and fix a couple of comments in meminfo.c
...
This fixes a typo and also notes that HW_PHYSMEM64 is defined on
NetBSD (not just OpenBSD).
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-16 14:40:15 -05:00
Kris Katterjohn
0f3d88a159
Use HW_PHYSMEM instead of HW_USERMEM in get_total_system_memory_impl
...
The code checked for sysctl being available and HW_PHYSMEM being
defined, but HW_USERMEM was actually being used with sysctl instead
of HW_PHYSMEM.
The case for OpenBSD, etc. use HW_PHYSMEM64 (which is obviously a
64-bit variant of HW_PHYSMEM) and the case for OSX uses HW_MEMSIZE
(which appears to be a 64-bit variant of HW_PHYSMEM).
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-16 14:40:15 -05:00
Nick Mathewson
0981ac4c59
Log more messages when failing to decode RSA keys
...
We log these messages at INFO level, except when we are reading a
private key from a file, in which case we log at WARN.
This fixes a regression from when we re-wrote our PEM code to be
generic between nss and openssl.
Fixes bug 29042, bugfix on 0.3.5.1-alpha.
2019-01-16 14:35:30 -05:00
Nick Mathewson
2f683465d4
Bump copyright date to 2019
2019-01-16 12:33:22 -05:00
Nick Mathewson
9473a386c4
Update copyright script for 2019
2019-01-16 12:33:09 -05:00
Nick Mathewson
038dbfc296
Merge branch 'maint-0.3.5'
2019-01-16 12:32:53 -05:00
Nick Mathewson
efe55b8898
Bump copyright date to 2019.
2019-01-16 12:32:32 -05:00
Nick Mathewson
e38e26d310
More line edits to changelog. Thanks, seborn!
2019-01-16 11:47:18 -05:00
Nick Mathewson
554f076f91
Give the changelog an edit
2019-01-16 11:09:54 -05:00
Nick Mathewson
dd524c6335
Bump to 0.4.0.1-alpha
2019-01-16 08:32:09 -05:00
Nick Mathewson
49062d72b5
Start on 0.4.0.1-alpha changelog
2019-01-16 08:28:07 -05:00
Nick Mathewson
139202174b
Remove changes entries that appeared in 0.3.5.7
2019-01-16 08:20:12 -05:00
Nick Mathewson
2dd23086f1
Remove fallback scripts and whitelist
...
They have been extracted to a new fallback-scripts.git repository.
Closes ticket 27914.
2019-01-15 19:20:25 -05:00
Nick Mathewson
a9c80788d7
Merge remote-tracking branch 'mikeperry-github/bug29089'
2019-01-15 18:29:20 -05:00
Nick Mathewson
31e784915e
Use [ -n "$x" ] in place of [ ! -z "$x" ] in chutney-git-bisect
...
Closes 29099.
2019-01-15 18:26:08 -05:00
Mike Perry
6440fdb8de
Changes file for Ticket 28142.
2019-01-15 22:53:03 +00:00
Nick Mathewson
ba58890118
Forward-port changelog and releasenotes entries from last Monday
2019-01-15 13:15:22 -05:00
Nick Mathewson
9a61d3f5ad
Merge branch 'bug24953_squashed'
2019-01-15 08:25:35 -05:00
rl1987
d47e7863bd
Depending on script mode, either use 'whitelist' or 'fallback list'
2019-01-15 08:25:29 -05:00
rl1987
7fbe7a2563
In updateFallbackDirs.py, say 'fallback list' instead of 'whitelist'
2019-01-15 08:25:29 -05:00
Nick Mathewson
c281e587bb
Merge branch 'ticket28058_squashed'
2019-01-15 08:08:41 -05:00
rl1987
30a925fe96
Add changes file
2019-01-15 08:08:29 -05:00
rl1987
7857455729
Add shellcheck to Travis CI builds
2019-01-15 08:08:29 -05:00
rl1987
136e6e7ceb
Run shellcheck for stuff in scripts/ as part of 'make check'
2019-01-15 08:08:29 -05:00
Nick Mathewson
b169c8c14f
Merge remote-tracking branch 'asn-github/adaptive_padding-final'
2019-01-14 14:48:00 -05:00
Nick Mathewson
691dec5d46
Merge branch 'maint-0.3.5'
2019-01-14 14:02:42 -05:00
rl1987
9d9e71824c
Rework rep_hist_log_link_protocol_counts()
2019-01-14 14:01:55 -05:00
Nick Mathewson
99947c3ce0
Merge remote-tracking branch 'teor/bug29015'
2019-01-14 13:59:07 -05:00
Alexander Færøy
59a88b3c3a
Rename TYPE to TRANSPORT in PT STATUS messages.
...
See: https://bugs.torproject.org/28181
2019-01-14 18:35:13 +01:00
