Nick Mathewson
495db72c1e
Merge branch 'maint-0.2.8' into maint-0.2.9
...
"ours" merge to avoid version bump.
2017-12-01 09:35:07 -05:00
Nick Mathewson
dc3890439f
Merge branch 'maint-0.2.5' into maint-0.2.8
...
"ours" merge to avoid version bump.
2017-12-01 09:34:47 -05:00
Nick Mathewson
998a247123
bump to 0.3.2.6-alpha-dev
2017-12-01 09:34:31 -05:00
Nick Mathewson
a12dbbd882
bump to 0.3.1.9-dev
2017-12-01 09:34:20 -05:00
Nick Mathewson
1983068ba9
bump to 0.3.0.13-dev
2017-12-01 09:34:09 -05:00
Nick Mathewson
73869c99a0
bump to 0.2.9.14-dev
2017-12-01 09:34:00 -05:00
Nick Mathewson
8f858de819
bump to 0.2.8.17-dev
2017-12-01 09:33:51 -05:00
Nick Mathewson
162a087e5f
bump to 0.2.5.16-dev
2017-12-01 09:33:41 -05:00
Nick Mathewson
5fbb52d10f
forward-port changelogs and releasenotes
2017-12-01 09:16:15 -05:00
George Kadianakis
7ae9e92ffb
Add changes file for #23862 .
2017-12-01 14:14:01 +02:00
George Kadianakis
1c9f063486
Remove a duplicate call to update_microdesc_downloads()
...
This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.
2017-12-01 14:13:22 +02:00
George Kadianakis
210f0c24f0
Update entry guard state whenever we download a consensus.
...
Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.
Fixes #23862 on 0.3.0.1-alpha
2017-12-01 14:09:29 +02:00
George Kadianakis
43c34dfca0
Add changes file for #23862 .
2017-12-01 14:06:36 +02:00
George Kadianakis
6bd64e8212
Remove a duplicate call to update_microdesc_downloads()
...
This call happens before we update our entry guards, so it needs to be
removed for the fix to #23862 to work.
2017-12-01 14:06:32 +02:00
George Kadianakis
8276a0ab85
Update entry guard state whenever we download a consensus.
...
Update guard state even if we don't have enough dirinfo since that
actually affects the future download of dirinfos.
Fixes #23862 on 0.3.0.1-alpha
2017-12-01 14:06:28 +02:00
Nick Mathewson
699899cbff
remove changes files that are going into 0.3.2.6-alpha or earlier.
2017-11-30 12:31:23 -05:00
Nick Mathewson
ce4a381935
Merge branch 'maint-0.3.2'
...
"ours" to avoid version bump.
2017-11-30 12:26:33 -05:00
Nick Mathewson
424ab08b5a
bump to 0.3.2.6-alpha
2017-11-30 12:26:30 -05:00
Nick Mathewson
9c89e8e435
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"ours" to avoid version bumps
2017-11-30 12:25:53 -05:00
Nick Mathewson
4ebd436541
version bump to 0.3.1.9
2017-11-30 12:25:48 -05:00
Nick Mathewson
6b9c2ac23e
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" to avoid version bump.
2017-11-30 12:25:07 -05:00
Nick Mathewson
f2ecdeb724
version bump to 0.3.0.13
2017-11-30 12:25:01 -05:00
Nick Mathewson
8f36104574
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 12:24:13 -05:00
Nick Mathewson
16c9cfd658
version bump to 0.2.9.14
2017-11-30 12:24:07 -05:00
Nick Mathewson
1fd6e25522
Merge branch 'maint-0.2.8' into maint-0.2.9
...
"ours" merge to avoid version bump.
2017-11-30 12:22:38 -05:00
Nick Mathewson
6ee4472544
version bump to 0.2.8.17
2017-11-30 12:22:32 -05:00
Nick Mathewson
2e219291be
Merge branch 'maint-0.2.5' into maint-0.2.8
...
"ours" to avoid version bump
2017-11-30 12:21:36 -05:00
Nick Mathewson
6bda6777c1
bump to 0.2.5.16
2017-11-30 12:19:48 -05:00
Nick Mathewson
cef844d017
Merge branch 'maint-0.3.2'
2017-11-30 12:07:59 -05:00
Nick Mathewson
fd73a168ca
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-30 12:07:59 -05:00
Nick Mathewson
ee48eb1eb5
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-30 12:07:59 -05:00
Nick Mathewson
5fc0587c04
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 12:07:59 -05:00
Nick Mathewson
7e2b012b46
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-30 12:07:59 -05:00
Nick Mathewson
ba4a9cf0c0
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-30 12:07:59 -05:00
Nick Mathewson
d459c08b7d
Merge branch 'trove-2017-012_030' into maint-0.3.0
2017-11-30 12:07:43 -05:00
Nick Mathewson
52d7af631c
Merge branch 'trove-2017-010_029' into maint-0.2.9
2017-11-30 12:07:26 -05:00
Nick Mathewson
f49876d66e
Merge branch 'trove-2017-012_025' into maint-0.2.5
2017-11-30 12:06:21 -05:00
Nick Mathewson
08ce39fb0f
Merge branch 'trove-2017-011_025' into maint-0.2.5
2017-11-30 12:06:17 -05:00
Nick Mathewson
a6a0c7a4ec
Merge branch 'trove-2017-009_025' into maint-0.2.5
2017-11-30 12:05:59 -05:00
Nick Mathewson
75509dc827
Fix changes file
2017-11-30 11:52:40 -05:00
Nick Mathewson
766d0a2d98
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-30 11:48:12 -05:00
Nick Mathewson
500f04a74e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-30 11:48:12 -05:00
Nick Mathewson
6c355d5763
Merge branch 'maint-0.3.2'
2017-11-30 11:48:12 -05:00
Nick Mathewson
25d50decb2
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-30 11:48:12 -05:00
Nick Mathewson
072e194a15
Merge branch 'bug21394_029' into maint-0.2.9
2017-11-30 11:48:06 -05:00
Nick Mathewson
a1b0a0b9cd
Avoid use-after-free error in 20020 fix
...
CID 1424328; found by coverity; bugfix on 93dbce4ddd98ca9a4ff2f;
bug not in any released Tor.
2017-11-30 11:44:15 -05:00
Nick Mathewson
1c7121be54
Merge branch 'bug24119_squashed'
2017-11-30 08:00:34 -05:00
Alex Xu (Hello71)
49a4961dad
Add changes/bug24119
2017-11-30 08:00:24 -05:00
Alex Xu (Hello71)
f1e8e54964
Simplify channel_rsa_id_group_set_badness, #24119
2017-11-30 08:00:24 -05:00
Fernando Fernandez Mancera
bef461ef1f
Switch -Wnormalized=id to -Wnormalized=nfkc
...
Modified -Wnormalized flag to nfkc option in configure.ac to avoid source code
identifier confusion.
Fixes #24467
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2017-11-29 20:29:55 -05:00
