cec555f44c
Merge branch 'tor-github/pr/720'
2019-02-28 12:32:16 +02:00
600f5f0db4
Merge branch 'maint-0.4.0'
2019-02-28 10:50:01 +10:00
aef6e61347
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-28 10:49:47 +10:00
de0969ef78
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:49:33 +10:00
6a61a020ee
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:49:19 +10:00
be71cce9f8
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3
2019-02-28 10:48:46 +10:00
065cfc473b
Merge branch 'maint-0.4.0'
2019-02-28 10:46:29 +10:00
90c8956e21
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-28 10:46:14 +10:00
be29dfedd9
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:45:59 +10:00
524731503e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:45:44 +10:00
3313444ef0
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-28 10:45:30 +10:00
761eb4cf79
Merge branch 'maint-0.4.0'
2019-02-27 09:59:42 -05:00
56f01e58b4
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0
2019-02-27 09:59:33 -05:00
d4b7975ce7
test/shared-random: use sr_state_free_all() rather than sr_state_free()
...
sr_state_free() was renamed to sr_state_free_all() between 0.2.9 and 0.3.3.
Part of 29599.
2019-02-27 15:06:53 +10:00
64e082e892
Merge branch 'bug29599_029' into bug29599_033
2019-02-27 15:06:39 +10:00
4d9eb4dd0e
test/shared-random: Stop leaking shared random state in the unit tests
...
Stop leaking parts of the shared random state in the shared-random unit
tests.
Fixes bug 29599; bugfix on 0.2.9.1-alpha.
2019-02-27 15:04:40 +10:00
ef12ab83c0
Merge branch 'maint-0.4.0'
2019-02-27 09:38:33 +10:00
ef2925e742
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-27 09:38:19 +10:00
15dc33849e
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-27 09:38:04 +10:00
1a194beb2c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-27 09:37:50 +10:00
6c966b894c
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-27 09:37:36 +10:00
39a1049932
Merge branch 'tor-github/pr/729'
2019-02-26 20:15:40 +02:00
b402a0887f
Merge branch 'tor-github/pr/655'
2019-02-26 11:30:44 -05:00
2a44ee9b8c
Merge branch 'maint-0.4.0'
2019-02-26 11:25:16 -05:00
a5dd41b9af
Merge branch 'tor-github/pr/638' into maint-0.4.0
2019-02-26 11:24:43 -05:00
3ac8cdb8cf
Merge branch 'maint-0.4.0'
2019-02-26 10:53:09 -05:00
e1ad22643e
maint: Helpful scripts for tor maintenance
...
Closes #29391
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-02-26 10:52:25 -05:00
ec695755e7
Merge branch 'maint-0.3.5'
2019-02-26 10:48:14 -05:00
4746e1261b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-26 10:48:12 -05:00
9c4ec414bd
Merge branch 'tor-github/pr/692' into maint-0.4.0
2019-02-26 10:47:54 -05:00
1216f99534
Merge branch 'tor-github/pr/691' into maint-0.3.5
2019-02-26 10:46:52 -05:00
732855c2e5
Merge branch 'maint-0.4.0'
2019-02-26 07:27:50 -05:00
35257a1c69
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0
2019-02-26 07:27:42 -05:00
57d33b5786
Merge branch 'tor-github/pr/698'
2019-02-26 12:35:14 +02:00
7fbfdf2af7
Merge branch 'tor-github/pr/611'
2019-02-26 12:33:23 +02:00
1b9e77349f
Fix some error-checking logic and a misleading error message
...
When IPv4Only (IPv6Only) was used but the address could not be
interpreted as a IPv4 (IPv6) address, the error message referred
to the wrong IP version.
This also fixes up the error-checking logic so it's more precise
about what's being checked.
Fixes bug 13221; bugfix on 0.2.3.9-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2019-02-25 16:03:42 -06:00
626e6d2c39
Merge remote-tracking branch 'tor-github/pr/684'
2019-02-25 13:33:39 -05:00
69238ca2da
Merge remote-tracking branch 'tor-github/pr/646'
2019-02-24 17:17:16 -05:00
34601105a3
Merge branch 'ticket29065_squashed'
2019-02-24 17:02:35 -05:00
b7dced893a
Fix shellcheck SC2006 warnings in test_switch_id.sh
2019-02-24 17:02:06 -05:00
df8ad64735
When a DirAuth checks reachability on itself and has IPv6, mark it as reachable
2019-02-22 13:36:02 -05:00
f229a33685
Merge remote-tracking branch 'nickm/thread_rng'
2019-02-22 16:07:57 +02:00
b3b737b875
Update pre-commit.git-hook for ticket 29553
...
- handle older source layout
- handle empty changes directories
- "set -e" so that we exit if there's a problem.
2019-02-21 13:35:33 -05:00
9ac8c85435
Merge branch 'maint-0.4.0'
...
"ours" to avoid version bump.
2019-02-21 13:25:54 -05:00
1bff5646e6
Bump to 0.4.0.2-alpha-dev
2019-02-21 13:25:33 -05:00
5f44e1e5dc
Merge branch 'maint-0.3.5' into maint-0.4.0
...
"ours" to avoid version bump.
2019-02-21 13:25:02 -05:00
955ca72f95
Bump to 0.3.5.8-dev
2019-02-21 13:24:42 -05:00
e1079266e7
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid version bump.
2019-02-21 13:23:52 -05:00
a56b9501f1
Bump to 0.3.4.11-dev
2019-02-21 13:23:46 -05:00
df70c44960
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" to avoid version bump
2019-02-21 13:23:22 -05:00
George Kadianakis
teor
Nick Mathewson
David Goulet
Kris Katterjohn
rl1987
Neel Chauhan