Roger Dingledine
f0a5ff9543
forward-port new change stanzas to 0.3.4
2018-07-12 21:35:59 -04:00
Roger Dingledine
ca56c2c7c5
fix typo
2018-07-12 21:12:35 -04:00
Roger Dingledine
7b77e075eb
bump to 0.3.4.5-rc for release
2018-07-12 20:28:36 -04:00
Roger Dingledine
7794f138ee
fold changes into 0.3.4.5-rc
2018-07-12 20:28:13 -04:00
Nick Mathewson
336d8e6126
Merge branch 'maint-0.3.4' into release-0.3.4
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
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
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
85d6b41d2c
Merge branch 'maint-0.3.4' into release-0.3.4
2018-07-09 15:18:09 -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
ab57cf6493
Pick a date
2018-07-09 10:47:10 -04:00
Nick Mathewson
fb2f7cc27b
Edit the changelog slightly.
2018-07-09 10:29:04 -04:00
Nick Mathewson
4e6d59a2cc
Wrap the changelog.
2018-07-09 10:26:13 -04:00
Nick Mathewson
e943f6fd6e
Start a changelog for 0.3.4.4-rc
2018-07-09 10:25:56 -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
27e2b0a685
Merge branch 'maint-0.3.4' into release-0.3.4
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
84800f5a8f
Merge branch 'maint-0.3.4' into release-0.3.4
2018-07-09 10:15:22 -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
5ced052a1e
Merge branch 'maint-0.3.4' into release-0.3.4
2018-07-09 09:24:48 -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
61c1393601
Merge branch 'maint-0.3.4' into release-0.3.4
2018-07-09 09:22:13 -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
5b3a7c7c0f
Merge branch 'maint-0.3.4' into release-0.3.4
2018-07-09 09:14:41 -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
f701a7c72a
Merge branch 'maint-0.3.4' into release-0.3.4
2018-07-09 09:11:42 -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
904f8714ce
Merge branch 'maint-0.3.4' into release-0.3.4
2018-07-09 09:09:01 -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
5b0820702a
Merge branch 'maint-0.3.4' into release-0.3.4
2018-07-03 13:31:18 -04: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
9b060547ce
Merge branch 'maint-0.3.4' into release-0.3.4
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