Nick Mathewson
|
da38904efb
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-12-11 16:56:31 -05:00 |
Nick Mathewson
|
1deda2106b
|
Merge branch 'bug24167_025' into maint-0.2.5
|
2017-12-11 16:56:28 -05:00 |
Nick Mathewson
|
eaaa1108a3
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-12-11 16:54:14 -05:00 |
Nick Mathewson
|
e11830b2b4
|
Merge branch 'maint-0.3.0' into release-0.3.0
|
2017-12-11 16:54:14 -05:00 |
Nick Mathewson
|
2ea573ece8
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-12-11 16:54:14 -05:00 |
Nick Mathewson
|
bc1ea4f470
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-12-11 16:54:11 -05:00 |
Nick Mathewson
|
f5d4bdf305
|
Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
|
2017-12-11 16:53:02 -05:00 |
Nick Mathewson
|
ebf4f3f823
|
Merge branch 'maint-0.3.0' into release-0.3.0
|
2017-12-11 16:51:58 -05:00 |
Nick Mathewson
|
7fcb222ab7
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-12-11 16:51:58 -05:00 |
Nick Mathewson
|
7e486dd6f7
|
Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
|
2017-12-11 16:51:54 -05:00 |
Nick Mathewson
|
87de19eff4
|
Merge branch 'maint-0.3.0' into release-0.3.0
|
2017-12-11 16:43:51 -05:00 |
Nick Mathewson
|
c55a054236
|
Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
|
2017-12-11 16:41:28 -05:00 |
Nick Mathewson
|
953a8f8510
|
Merge branch 'maint-0.2.8' into maint-0.2.9
|
2017-12-01 12:13:40 -05:00 |
Nick Mathewson
|
df1bae8f0f
|
Merge branch 'maint-0.3.0' into release-0.3.0
|
2017-12-01 12:13:40 -05:00 |
Nick Mathewson
|
3bca705c54
|
Merge branch 'maint-0.2.9' into maint-0.3.0
|
2017-12-01 12:13:40 -05:00 |
Nick Mathewson
|
f97f301b5b
|
Merge branch 'maint-0.2.5' into maint-0.2.8
|
2017-12-01 12:13:39 -05:00 |
Nick Mathewson
|
461e34bb3d
|
Fix a clang compilation warning in rendservice.c
Fixes bug 24480; bugfix on 0.2.5.16.
|
2017-12-01 12:13:15 -05:00 |
Nick Mathewson
|
27b04b8bad
|
Merge branch 'maint-0.3.0' into release-0.3.0
|
2017-12-01 09:35:43 -05:00 |
Nick Mathewson
|
6e3ec8222c
|
Merge branch 'maint-0.2.9' into maint-0.3.0
"ours" merge to avoid version bump.
|
2017-12-01 09:35:16 -05:00 |
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
|
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
|
e5e3f13640
|
copy changelog to releasenotes
|
2017-12-01 09:15:12 -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 |
Nick Mathewson
|
b734f871b7
|
Changelog for 0.3.0.13
|
2017-11-30 15:10:36 -05:00 |
Nick Mathewson
|
2b716e8599
|
Merge branch 'maint-0.3.0' into release-0.3.0
|
2017-11-30 12:28:39 -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
|
f1cbb09e35
|
Merge branch 'maint-0.3.0' into release-0.3.0
|
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
|
b1c543cf4d
|
Merge branch 'maint-0.3.0' into release-0.3.0
|
2017-11-30 11:48:12 -05:00 |