Commit Graph
22178 Commits
Author SHA1 Message Date
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
Nick Mathewson 98a9e2fb86 Combine and rename and sort some sections in the releasenotes 2016-08-02 10:19:51 -04:00
Nick Mathewson 64591c3e55 Today might be the day. 2016-08-02 10:04:52 -04:00
Roger Dingledine af0ba03389 what went wrong such that this changelog stanza got in twice? 2016-07-29 12:25:41 -04:00
Roger Dingledine e37ae4fd3c normalize quotes around people we know 2016-07-29 12:19:26 -04:00
Nick Mathewson fac0decef2 Roger likes sentences to end with a period. 2016-07-29 11:37:08 -04:00
Nick Mathewson 176a57fd4c Merge branch 'maint-0.2.8' into release-0.2.8 2016-07-29 11:17:35 -04:00
Nick Mathewson 11386eb6d1 bump to 0.2.8.6 2016-07-29 11:17:28 -04:00
Nick Mathewson 7ebcc1b5c4 More work on 0.2.8.6 notes 2016-07-29 11:14:37 -04:00
Nick Mathewson 258988ca51 Merge branch 'maint-0.2.8' into release-0.2.8 2016-07-29 10:23:29 -04:00
teor (Tim Wilson-Brown) 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
Nick Mathewson 845d3fefac Update ReleaseNotes 2016-07-26 20:08:49 -04:00
Nick Mathewson babafdd4fb Start changelog for 0.2.8.6 2016-07-26 20:06:21 -04:00
Nick Mathewson f1973e70a4 Coverity hates it when we do "E1 ? E2 : E2".
It says, 'Incorrect expression (IDENTICAL_BRANCHES)'

Fix for CID 1364127. Not in any released Tor.
2016-07-21 14:14:33 +02:00
Nick Mathewson 4d5b252f0f Merge branch 'maint-0.2.7' into maint-0.2.8 2016-07-19 12:34:27 +02:00
Nick Mathewson 4d70ed7be0 Merge branch 'maint-0.2.6' into maint-0.2.7 2016-07-19 12:32:14 +02:00
Nick Mathewson 210928f66a Merge branch 'maint-0.2.5' into maint-0.2.6 2016-07-19 12:31:54 +02:00
Nick Mathewson d95c2809b3 Merge branch 'maint-0.2.4' into maint-0.2.5 2016-07-19 12:31:20 +02:00
Karsten Loesing 79939c6f11 Update geoip and geoip6 to the July 6 2016 database. 2016-07-18 08:40:22 +02:00
Nick Mathewson fe53f9c17d Merge branch 'maint-0.2.8' into release-0.2.8 2016-07-17 13:54:58 -04:00
Nick Mathewson fbae15a856 Merge remote-tracking branch 'weasel/bug19660' into maint-0.2.8 2016-07-17 13:54:40 -04:00
Nick Mathewson 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
Nick Mathewson 449c61f452 Merge branch 'maint-0.2.8' into release-0.2.8 2016-07-13 09:19:29 -04:00
Nick Mathewson c1bfa65211 changes file for bug18397 2016-07-13 09:19:23 -04:00
Nick Mathewson bb731ca665 Merge remote-tracking branch 'Jigsaw52/seccomp-fix-18397' into maint-0.2.8 2016-07-13 09:16:59 -04:00