49e4848641
Fold entry into changelog.
2016-09-23 11:12:54 -04:00
89e4126cd9
Merge branch 'maint-0.2.8' into release-0.2.8
2016-09-23 09:30:48 -04:00
db6153e70c
Merge remote-tracking branch 'teor/broken-028-fallbacks' into maint-0.2.8
2016-09-23 09:29:55 -04:00
31df6a7a23
Start on an 0.2.8.8 changelog.
2016-09-22 15:28:26 -04:00
7df4f23d95
Merge branch 'maint-0.2.8' into release-0.2.8
2016-09-22 15:20:19 -04:00
d78711c0ae
LintChanges fix
2016-09-22 15:19:59 -04:00
6e96eababe
Merge branch 'bug20203_027_squashed' into maint-0.2.8
2016-09-22 15:17:00 -04:00
e4aaf76660
When clearing cells from a circuit for OOM reasons, tell cmux we did so.
...
Not telling the cmux would sometimes cause an assertion failure in
relay.c when we tried to get an active circuit and found an "active"
circuit with no cells.
Additionally, replace that assert with a test and a log message.
Fix for bug 20203. This is actually probably a bugfix on
0.2.8.1-alpha, specifically my code in 8b4e5b7ee9
2016-09-22 15:16:07 -04:00
caa16bffc7
Merge branch 'maint-0.2.8' into release-0.2.8
2016-09-22 09:00:23 -04:00
1edea87c2a
Fix lintchanges warnings in 028
2016-09-22 09:00:16 -04:00
df7b0011e3
Changes file for #20190 : remove broken fallbacks
2016-09-22 08:08:59 +10:00
a8b607bfdd
Merge branch 'maint-0.2.8' into release-0.2.8
2016-09-20 19:30:38 -04:00
9b5a19c64b
Don't look at any routerstatus_t when the networkstatus is inconsistent
...
For a brief moment in networkstatus_set_current_consensus(), the old
consensus has been freed, but the node_t objects still have dead
pointers to the routerstatus_t objects within it. During that
interval, we absolutely must not do anything that would cause Tor to
look at those dangling pointers.
Unfortunately, calling the (badly labeled!) current_consensus macro
or anything else that calls into we_use_microdescriptors_for_circuits(),
can make us look at the nodelist.
The fix is to make sure we identify the main consensus flavor
_outside_ the danger zone, and to make the danger zone much much
smaller.
Fixes bug 20103. This bug has been implicitly present for AGES; we
just got lucky for a very long time. It became a crash bug in
0.2.8.2-alpha when we merged 35bbf2e4a44460feaf28
2016-09-20 10:43:58 -04:00
8a163e9579
Merge branch 'maint-0.2.8' into release-0.2.8
2016-09-07 13:54:46 -04:00
6494f3346b
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-09-07 13:54:12 -04:00
11edbf4808
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-09-07 13:54:03 -04:00
52a99cb6c1
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-09-07 13:53:53 -04:00
e4d82da05b
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-09-07 13:53:43 -04:00
56f95ba94d
Update geoip and geoip6 to the September 6 2016 database.
2016-09-07 11:08:04 +02:00
619507a029
Fold the last (I hope) two changes into the changelog
2016-08-24 10:50:47 -04:00
041947977e
Merge branch 'maint-0.2.8' into release-0.2.8
2016-08-24 10:44:21 -04:00
5280a700aa
Changes file for bug19973
2016-08-24 10:34:00 -04:00
824b160931
Merge branch 'maint-0.2.8' into release-0.2.8
2016-08-24 10:03:29 -04:00
d3a975ea05
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-08-24 10:02:52 -04:00
f60da19211
Changes file for bifroest
2016-08-24 10:02:42 -04:00
fa038ebb7b
Start on an 0.2.8.7 changelog.
2016-08-23 10:08:51 -04:00
e085b11d27
Merge branch 'maint-0.2.8' into release-0.2.8
2016-08-22 10:19:52 -04:00
0ba05313d5
Do not pass NULL to log(%s) in dir_server_new.
...
This bug had existed since 0.2.4.7-alpha, but now that we have
FallbackDirs by default, it actually matters.
Fixes bug 19947; bugfix on 0.2.4.7-alpha or maybe 0.2.8.1-alpha.
Rubiate wrote the patch; teor wrote the changes file.
2016-08-22 01:22:19 -04:00
6e181bafff
Merge branch 'maint-0.2.8' into release-0.2.8
2016-08-19 19:35:52 -04:00
65cf5130ef
Merge branch 'bug19903_028_v2' into maint-0.2.8
2016-08-19 19:35:26 -04:00
49843c980a
Avoid confusing GCC 4.2.1 by saying "int foo()... inline int foo() {...}"
...
Fixes bug 19903; bugfix on 0.2.8.1-alpha.
2016-08-19 19:34:39 -04:00
459e5d705e
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-08-12 10:27:14 -04:00
db372addc8
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-08-12 10:27:08 -04:00
742ff2cddb
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-08-12 10:27:01 -04:00
46754d6081
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-08-12 10:26:48 -04:00
1410947351
Update geoip and geoip6 to the August 2 2016 database.
2016-08-12 11:53:38 +02:00
7ebcc1b5c4
More work on 0.2.8.6 notes
2016-07-29 11:14:37 -04:00
258988ca51
Merge branch 'maint-0.2.8' into release-0.2.8
2016-07-29 10:23:29 -04:00
1c4a2dd208
Remove a fallback that was on the hardcoded list, then opted-out
...
The fallback was added in 0.2.8.2-alpha.
2016-07-29 10:23:15 -04:00
babafdd4fb
Start changelog for 0.2.8.6
2016-07-26 20:06:21 -04:00
4d5b252f0f
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-07-19 12:34:27 +02:00
4d70ed7be0
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-07-19 12:32:14 +02:00
210928f66a
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-07-19 12:31:54 +02:00
d95c2809b3
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-07-19 12:31:20 +02:00
79939c6f11
Update geoip and geoip6 to the July 6 2016 database.
2016-07-18 08:40:22 +02:00
fe53f9c17d
Merge branch 'maint-0.2.8' into release-0.2.8
2016-07-17 13:54:58 -04:00
fbae15a856
Merge remote-tracking branch 'weasel/bug19660' into maint-0.2.8
2016-07-17 13:54:40 -04:00
bec4e41f4b
Fix warnings in test_util_formats.
...
Storing 255 into a char gives a warning when char is signed.
Fixes bug 19682; bugfix on 0.2.8.1-alpha, where these tests were added.
2016-07-17 13:51:45 -04:00
449c61f452
Merge branch 'maint-0.2.8' into release-0.2.8
2016-07-13 09:19:29 -04:00
c1bfa65211
changes file for bug18397
2016-07-13 09:19:23 -04:00
Nick Mathewson
teor
Karsten Loesing