Nick Mathewson
9e247ac271
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 16:39:10 -04:00
Nick Mathewson
39d3187b0d
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-18 16:39:10 -04:00
Nick Mathewson
78386d8cdd
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 16:39:10 -04:00
Nick Mathewson
501deba8cf
Try putting ulimit -c 0 in test_bt.sh to see if it fixes bug 26787
2018-07-18 16:33:48 -04:00
Nick Mathewson
a7bd20ebaf
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-18 15:08:57 -04:00
Nick Mathewson
c31700d664
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 15:04:14 -04:00
Nick Mathewson
559f79fd79
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 15:03:27 -04:00
Nick Mathewson
a321d72401
Merge branch 'bug26485_029_squashed' into maint-0.2.9
2018-07-18 15:01:03 -04:00
Nick Mathewson
fd5dce0a1b
Add a test for format_recommended_version_list.
2018-07-18 15:00:53 -04:00
Nick Mathewson
8ee1fe7aa7
Warn when an authority has voted for a version with a space in it.
...
Another way to try to prevent a recurrence of 26485.
2018-07-18 15:00:53 -04:00
Nick Mathewson
dcee4d4c9c
Warn the directory authority operator if their versions list is bogus
...
Prevents bug 26485; bugfix on 0.1.1.6-alpha.
2018-07-18 15:00:53 -04:00
teor
449d190e2e
SKIP test_key_expiration.sh on Windows until the underlying issue is resolved
...
Skip an unreliable key expiration test on Windows, until the underlying
issue in bug 26076 is resolved.
Fixes bug 26853; bugfix on 0.3.2.1-alpha.
2018-07-18 12:37:12 +10:00
Nick Mathewson
304ee896d1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-17 14:56:52 -04:00
Nick Mathewson
28d1057d56
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-17 14:56:52 -04:00
Nick Mathewson
61a2762e35
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-17 14:56:52 -04:00
teor
6dafddd05d
SKIP test_keygen.sh on Windows until the underlying issue is resolved
...
Skip an unreliable key generation test on Windows, until the underlying
issue in bug 26076 is resolved.
Fixes bug 26830; bugfix on 0.2.7.3-rc.
2018-07-17 14:56:18 -04:00
rl1987
8645647250
Fix build to work with --disable-unittests again
2018-07-17 12:09:34 +00:00
Nick Mathewson
710188f84e
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-12 14:32:16 -04:00
Nick Mathewson
98ee23ca1e
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-12 14:32:16 -04:00
Nick Mathewson
e0f33c1d3e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-12 14:32:16 -04:00
Roger Dingledine
cd4795ca3e
put new bridge auth Serge into place
...
The "Bifroest" bridge authority has been retired; the new bridge authority
is "Serge", and it is operated by George from the TorBSD project.
Closes ticket 26771.
2018-07-12 14:12:13 -04:00
Nick Mathewson
16bdbddc2c
When setting a nonstandard malloc, disable the system malloc.
...
Closes ticket 20424.
2018-07-11 09:37:29 -04:00
Nick Mathewson
e3e6335a08
Add controller support for listing ExtORPort and HTTPTunnelPorts
...
Closes ticket 26647.
2018-07-10 10:50:43 -04:00
Nick Mathewson
d7ad6d924e
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" to avoid version bump.
2018-07-09 15:17:48 -04:00
Nick Mathewson
5ce348c4c7
Bump to 0.3.4.4-rc-dev
2018-07-09 15:17:38 -04:00
Nick Mathewson
f5e3bcb60b
Bump to 0.3.3.8-dev.
2018-07-09 15:17:16 -04:00
Nick Mathewson
98dff5df3f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-09 10:17:20 -04:00
Nick Mathewson
250e0fc1c4
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-09 10:17:20 -04:00
Nick Mathewson
6ad2c2b92f
Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2
2018-07-09 10:17:17 -04:00
Nick Mathewson
529faef28e
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-09 10:15:16 -04:00
Nick Mathewson
69918629f5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-09 10:14:43 -04:00
Nick Mathewson
4a604d9938
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-09 10:14:43 -04:00
Nick Mathewson
8b53dfc362
Merge branch 'bug26269_029' into maint-0.2.9
2018-07-09 10:14:39 -04:00
Nick Mathewson
afee785417
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" merge to avoid version bump
2018-07-09 09:24:14 -04:00
Nick Mathewson
532873a924
Bump to 0.3.3.8
2018-07-09 09:24:07 -04:00
Nick Mathewson
9320100d6e
Bump to 0.3.3.4-rc
2018-07-09 09:23:39 -04:00
Nick Mathewson
b74ed31f90
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" merge to avoid cherry-picked copy of #25512 fix, which is already in
this branch.
2018-07-09 09:21:46 -04:00
Nick Mathewson
a95cfb8a58
Clear all control.c flags on control_free_all()
...
Fixes bug 25512.
(Cherry-picked from 3519d0c808
2018-07-09 09:20:45 -04:00
Nick Mathewson
75d9db9e5b
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-09 09:14:37 -04:00
Nick Mathewson
f721a08220
Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3
2018-07-09 09:13:58 -04:00
Nick Mathewson
d3894dc34b
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-09 09:11:41 -04:00
Nick Mathewson
1af69c1812
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-09 09:11:41 -04:00
Nick Mathewson
451a84cecb
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-09 09:11:41 -04:00
Nick Mathewson
9b9625bdfa
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-09 09:09:01 -04:00
Nick Mathewson
fead22fb2a
Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3
2018-07-09 09:08:58 -04:00
Karsten Loesing
9faa28b60e
Update geoip and geoip6 to the July 3 2018 database.
2018-07-06 20:54:03 +02:00
Nick Mathewson
32d9d69350
Merge remote-tracking branch 'github/bug26568_034' into maint-0.3.4
2018-07-03 13:16:37 -04:00
Nick Mathewson
a4e8f94507
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-03 09:48:03 -04:00
Nick Mathewson
4c094436c5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-03 09:48:03 -04:00
Nick Mathewson
d38e474950
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-03 09:48:03 -04:00
