torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
22,202 Commits 53 Branches 631 Tags
7df4f23d952f892c09f5ef930e9e4f297f784cce
Commit Graph
22202 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 7df4f23d95 Merge branch 'maint-0.2.8' into release-0.2.8 2016-09-22 15:20:19 -04:00
Nick Mathewson d78711c0ae LintChanges fix 2016-09-22 15:19:59 -04:00
Nick Mathewson 6e96eababe Merge branch 'bug20203_027_squashed' into maint-0.2.8 2016-09-22 15:17:00 -04:00
Nick Mathewson 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 where I
made circuit_mark_for_close_() do less in order to simplify our call
graph. Thanks to "cypherpunks" for help diagnosing.
 2016-09-22 15:16:07 -04:00
Nick Mathewson caa16bffc7 Merge branch 'maint-0.2.8' into release-0.2.8 2016-09-22 09:00:23 -04:00
Nick Mathewson 1edea87c2a Fix lintchanges warnings in 028 2016-09-22 09:00:16 -04:00
Nick Mathewson a8b607bfdd Merge branch 'maint-0.2.8' into release-0.2.8 2016-09-20 19:30:38 -04:00
Nick Mathewson 9ebe202da0 Merge remote-tracking branch 'public/bug20103_028_v3' into maint-0.2.8 2016-09-20 19:30:24 -04:00
Nick Mathewson f527a809b3 Merge branch 'maint-0.2.8' into release-0.2.8 2016-09-20 19:29:03 -04:00
teor 19a9872be2 fixup! Update hard-coded fallback list based on pre-0.2.9 checks 2016-09-21 09:13:04 +10:00
Nick Mathewson 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 35bbf2e4a4 to make
find_dl_schedule start looking at the consensus, and 4460feaf28
which made node_get_all_orports less (accidentally) tolerant of
nodes with a valid ri pointer but dangling rs pointer.
 2016-09-20 10:43:58 -04:00
teor c6d51b4577 Update hard-coded fallback list based on pre-0.2.9 checks 2016-09-20 16:49:45 +10:00
Nick Mathewson 8a163e9579 Merge branch 'maint-0.2.8' into release-0.2.8 2016-09-07 13:54:46 -04:00
Nick Mathewson 6494f3346b Merge branch 'maint-0.2.7' into maint-0.2.8 2016-09-07 13:54:12 -04:00
Nick Mathewson 11edbf4808 Merge branch 'maint-0.2.6' into maint-0.2.7 2016-09-07 13:54:03 -04:00
Nick Mathewson 52a99cb6c1 Merge branch 'maint-0.2.5' into maint-0.2.6 2016-09-07 13:53:53 -04:00
Nick Mathewson e4d82da05b Merge branch 'maint-0.2.4' into maint-0.2.5 2016-09-07 13:53:43 -04:00
Karsten Loesing 56f95ba94d Update geoip and geoip6 to the September 6 2016 database. 2016-09-07 11:08:04 +02:00
Nick Mathewson 06b9f75f3e Merge branch 'maint-0.2.8' into release-0.2.8 2016-08-24 14:46:13 -04:00
Nick Mathewson e9124b8cc7 bump to 0.2.8.7-dev 2016-08-24 14:46:08 -04:00
Roger Dingledine 263088633a fix typo and possible confusion in changelog entry tor-0.2.8.7 2016-08-24 13:55:35 -04:00
Nick Mathewson ffa90d8142 ReleaseNotes update 2016-08-24 13:38:30 -04:00
Nick Mathewson 84b8131826 Roger points out that most people do not set UpdateBridgesFromAuthority 2016-08-24 13:37:52 -04:00
Nick Mathewson 1cc26c906c Remove duplicate section 2016-08-24 11:11:00 -04:00
Nick Mathewson 82957bf91a Merge branch 'maint-0.2.8' into release-0.2.8 2016-08-24 11:02:17 -04:00
Nick Mathewson 57ba7ab39a Bump to 0.2.8.7 2016-08-24 11:01:57 -04:00
Nick Mathewson 46e2c15e2f missed one 2016-08-24 10:56:39 -04:00
Nick Mathewson 619507a029 Fold the last (I hope) two changes into the changelog 2016-08-24 10:50:47 -04:00
Nick Mathewson 041947977e Merge branch 'maint-0.2.8' into release-0.2.8 2016-08-24 10:44:21 -04:00
Nick Mathewson 5280a700aa Changes file for bug19973 2016-08-24 10:34:00 -04:00
teor b1ad024d30 Fix path selection on firewalled clients 
Signed-off-by: teor <teor2345@gmail.com>
 2016-08-24 10:07:47 -04:00
Nick Mathewson 824b160931 Merge branch 'maint-0.2.8' into release-0.2.8 2016-08-24 10:03:29 -04:00
Nick Mathewson d3a975ea05 Merge branch 'maint-0.2.7' into maint-0.2.8 2016-08-24 10:02:52 -04:00
Nick Mathewson f60da19211 Changes file for bifroest 2016-08-24 10:02:42 -04:00
Isis Lovecruft 41ab23bed5 Replace Tonga with Bifroest. 
* FIXES #19728: https://bugs.torproject.org/19728
 * CLOSES #19690: https://bugs.torproject.org/19690
 2016-08-24 10:01:23 -04:00
Nick Mathewson fa038ebb7b Start on an 0.2.8.7 changelog. 2016-08-23 10:08:51 -04:00
Nick Mathewson e085b11d27 Merge branch 'maint-0.2.8' into release-0.2.8 2016-08-22 10:19:52 -04:00
Nick Mathewson 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
Nick Mathewson 6e181bafff Merge branch 'maint-0.2.8' into release-0.2.8 2016-08-19 19:35:52 -04:00
Nick Mathewson 65cf5130ef Merge branch 'bug19903_028_v2' into maint-0.2.8 2016-08-19 19:35:26 -04:00
Nick Mathewson 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
Nick Mathewson 459e5d705e Merge branch 'maint-0.2.7' into maint-0.2.8 2016-08-12 10:27:14 -04:00
Nick Mathewson db372addc8 Merge branch 'maint-0.2.6' into maint-0.2.7 2016-08-12 10:27:08 -04:00
Nick Mathewson 742ff2cddb Merge branch 'maint-0.2.5' into maint-0.2.6 2016-08-12 10:27:01 -04:00
Nick Mathewson 46754d6081 Merge branch 'maint-0.2.4' into maint-0.2.5 2016-08-12 10:26:48 -04:00
Karsten Loesing 1410947351 Update geoip and geoip6 to the August 2 2016 database. 2016-08-12 11:53:38 +02:00
Nick Mathewson ee47010e60 Merge branch 'maint-0.2.8' into release-0.2.8 2016-08-02 11:13:51 -04:00
Nick Mathewson 6b740aa46b bump maint-0.2.8 to 0.2.8.6-dev 2016-08-02 11:13:44 -04:00
Nick Mathewson 4d217548e3 They are many but some are large. tor-0.2.8.6 2016-08-02 10:38:57 -04:00
Nick Mathewson f2517b31c4 tm_year++ 2016-08-02 10:37:42 -04:00