rl1987
e2b418bab5
Rename to pre-push.git-hook
2018-11-29 10:56:56 +02:00
rl1987
b2053cfc44
Also disallow fixup/squash commits in maint-* and release-*
2018-11-20 16:37:30 +02:00
rl1987
ffee0a6384
Add pre-push git hook to prevent fixup and squash commits from ending up in master
2018-11-20 15:40:52 +02:00
Nick Mathewson
8183640ada
Merge branch 'maint-0.3.5'
2018-11-19 10:18:57 -05:00
Alexander Færøy
3260914db0
Add missing library to build tor-print-ed-signing-cert.
...
To succesful compile tor-print-ed-signing-cert.exe on Windows we
sometimes need to include the @TOR_LIB_GDI@ library.
See: https://bugs.torproject.org/28485
2018-11-19 10:18:44 -05:00
Nick Mathewson
a8df39e955
Merge remote-tracking branch 'tor-github/pr/519'
2018-11-19 08:47:03 -05:00
Nick Mathewson
26539ec3ae
Merge remote-tracking branch 'tor-github/pr/518'
2018-11-19 08:45:41 -05:00
Nick Mathewson
48b08f0592
Merge branch 'ticket27359_v2_squashed'
2018-11-19 08:26:49 -05:00
Nick Mathewson
0e762c0cf5
Test new functions in nodelist.c
2018-11-19 08:26:10 -05:00
Nick Mathewson
4f9548f893
Expose more nodelist.c functions to tests
2018-11-19 08:26:10 -05:00
Nick Mathewson
aa1d767e6b
Aim for 100% test coverage on nodefamily.c
2018-11-19 08:26:10 -05:00
Nick Mathewson
426c9561c5
Use nodefamily_t in microdescriptors.
...
Closes ticket 27359.
2018-11-19 08:26:10 -05:00
Nick Mathewson
83be4d2bbd
Backend for compact node-family representation.
...
This representation is meant to save memory in microdescriptors --
we can't use it in routerinfo_t yet, since those families need to be
encoded losslessly for directory voting to work.
This representation saves memory in three ways:
1. It uses only one allocation per family. (The old way used a
smartlist (2 allocs) plus one strdup per entry.)
2. It stores identity digests in binary, not hex.
3. It keeps families in a canonical format, memoizes, and
reference-counts them.
Part of #27359 .
2018-11-19 08:26:10 -05:00
Nick Mathewson
bf82389e19
Copy 0.3.5.5-alpha changelog into master
2018-11-16 11:32:52 -05:00
Nick Mathewson
f42c3cfe2e
Merge branch 'maint-0.3.5'
...
"ours" to avoid version bump.
2018-11-16 11:32:10 -05:00
Nick Mathewson
942c2da48e
Bump to 0.3.5.5-alpha-dev
2018-11-16 11:32:04 -05:00
Nick Mathewson
5065a68504
Merge branch 'maint-0.3.5'
2018-11-16 08:58:25 -05:00
Nick Mathewson
35558c39dd
Merge remote-tracking branch 'dgoulet/ticket27471_035_02' into maint-0.3.5
2018-11-16 08:57:56 -05:00
Nick Mathewson
306098f851
Merge branch 'maint-0.3.5'
...
"ours" to avoid version bump.
2018-11-16 08:29:05 -05:00
Nick Mathewson
c9906cc3f6
Bump to 0.3.5.5-alpha
2018-11-16 08:28:45 -05:00
Nick Mathewson
be88f12b7f
Merge branch 'maint-0.3.5'
2018-11-15 17:08:34 -05:00
Nick Mathewson
1b4075cb27
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" merge to avoid taking 25573 and 27686 again.
2018-11-15 17:08:04 -05:00
Nick Mathewson
fe1fb4b0c3
Merge remote-tracking branch 'public/ticket27686_034' into maint-0.3.4
2018-11-15 17:01:54 -05:00
Nick Mathewson
80a6228aac
Merge branch 'bug25573-034-typefix' into maint-0.3.4
2018-11-15 16:58:16 -05:00
Nick Mathewson
d612f7d950
Merge branch 'maint-0.3.5'
2018-11-15 16:56:11 -05:00
Nick Mathewson
8af8ecabbe
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" merge to avoid duplicating conflict resolution in merge of 24104
2018-11-15 16:55:42 -05:00
Nick Mathewson
15e752e6b1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-15 16:54:56 -05:00
Nick Mathewson
cbe04d4550
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-11-15 16:54:16 -05:00
Nick Mathewson
066d257674
Merge branch 'maint-0.3.5'
2018-11-15 16:47:25 -05:00
Nick Mathewson
c0e18d2f89
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-15 16:47:25 -05:00
Nick Mathewson
63312e0299
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-15 16:47:25 -05:00
Nick Mathewson
aebe8a82c9
Merge branch 'bug26913_033' into maint-0.3.3
2018-11-15 16:47:22 -05:00
Nick Mathewson
8569166c70
Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9
...
Resolved conflicts with the 26269 fix in 015fcd0e11
2018-11-15 16:43:50 -05:00
Nick Mathewson
e47f23ba53
Merge branch 'maint-0.3.5'
2018-11-15 16:38:32 -05:00
Nick Mathewson
a88ce61b35
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" merge to avoid the 0.3.3 version of #27550 .
2018-11-15 16:38:19 -05:00
Nick Mathewson
1e6ffeaeaa
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-15 16:37:41 -05:00
Nick Mathewson
34e4d5a783
Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3
2018-11-15 16:37:02 -05:00
Nick Mathewson
31cc0d2c0b
Merge branch 'maint-0.3.5'
2018-11-15 16:11:29 -05:00
Nick Mathewson
4b6b58ed8e
Merge branch 'bug27740_035_fix' into maint-0.3.5
2018-11-15 16:11:06 -05:00
rl1987
d9f7cb3f62
Fix shellcheck issues in cov-diff - SC2231, SC2006 and SC2086
2018-11-15 19:37:07 +02:00
rl1987
8cb817cc5e
Add changes file
2018-11-15 19:35:56 +02:00
rl1987
4fc584f20e
Fix one last SC2086
2018-11-15 19:35:56 +02:00
rl1987
7c04b00e65
Fix most instances of SC2086 warning
2018-11-15 19:35:56 +02:00
rl1987
ce1b018ab7
Fix shellcheck SC2006 warnings in 'coverage' script
2018-11-15 19:35:56 +02:00
Nick Mathewson
92f71b8e88
Merge branch 'maint-0.3.5'
2018-11-15 09:06:18 -05:00
Nick Mathewson
a9db07f325
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-15 09:06:18 -05:00
teor
27b9170475
Appveyor: add comments to the config file
...
Documentation for 28399, 28454, and previous fixes.
2018-11-15 19:23:41 +10:00
teor
83c1baca16
Appveyor: manually add zstd flags to configure
...
The mingw zstd from MSYS2 doesn't come with a pkg-config file.
Fixes 28454 on Tor 0.3.4.1-alpha.
2018-11-15 19:23:37 +10:00
teor
540c833f20
Appveyor: remove incorrect OpenSSL path
...
Fixes 28399 on 0.3.4.1-alpha.
2018-11-15 19:23:33 +10:00
teor
4c3d61b5f2
Appveyor: Improve diagnostics
...
Stop installing MSYS2 packages.
We're compiling for mingw, so we only need mingw packages.
Run pacman in verbose mode.
Explicitly install pkg-config and xz, to future-proof our builds.
Diagnostics for 28399.
2018-11-15 19:23:29 +10:00
