Roger Dingledine
6c02f4d2e3
fold in the next 0.2.2 changes
2012-01-05 18:38:32 -05:00
Roger Dingledine
43454a872e
Merge branch 'maint-0.2.2' into release-0.2.2
2012-01-05 18:28:27 -05:00
Nick Mathewson
ccd8289958
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2012-01-05 14:16:30 -05:00
Nick Mathewson
b839ace7d0
Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1
2012-01-05 14:11:42 -05:00
Robert Ransom
4752b34879
Log at info level when disabling SSLv3
2012-01-05 12:28:56 -05:00
Nick Mathewson
0a00678e56
Add a changes file for bug4822
2012-01-05 12:28:55 -05:00
Nick Mathewson
db78fe4589
Disable SSLv3 when using a not-up-to-date openssl
...
This is to address bug 4822, and CVE-2011-4576.
2012-01-05 12:28:55 -05:00
Roger Dingledine
98402d0865
Merge branch 'maint-0.2.2' into release-0.2.2
2012-01-05 06:46:01 -05:00
Roger Dingledine
a1074c7aa2
Merge branch 'maint-0.2.1' into maint-0.2.2
2012-01-05 06:45:28 -05:00
Roger Dingledine
df17b62d54
add a changes file for ticket 4825
2012-01-05 06:42:26 -05:00
Karsten Loesing
1db1b23a7b
Update to the January 2012 GeoIP database.
2012-01-05 11:10:57 +01:00
Sebastian Hahn
d861b4cc9d
Fix spelling in a controlsocket log msg
...
Fixes bug 4803.
2011-12-30 23:27:02 +01:00
Nick Mathewson
84bf8e3808
Merge remote-tracking branch 'public/bug4788' into maint-0.2.2
2011-12-28 16:50:45 -05:00
Nick Mathewson
c563551eef
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-12-28 15:56:37 -05:00
Nick Mathewson
120a745346
Bug 4786 fix: don't convert EARLY to RELAY on v1 connections
...
We used to do this as a workaround for older Tors, but now it's never
the correct thing to do (especially since anything that didn't
understand RELAY_EARLY is now deprecated hard).
2011-12-28 15:54:06 -05:00
Nick Mathewson
9bcb187387
Authorities reject insecure Tors.
...
This patch should make us reject every Tor that was vulnerable to
CVE-2011-0427. Additionally, it makes us reject every Tor that couldn't
handle RELAY_EARLY cells, which helps with proposal 110 (#4339 ).
2011-12-27 21:47:04 -05:00
Sebastian Hahn
da876aec63
Provide correct timeradd/timersup replacements
...
Bug caught and patch provided by Vektor. Fixes bug 4778.t
2011-12-25 23:19:08 +01:00
Nick Mathewson
b5e6bbc01d
Do not even try to keep going on a socket with socklen==0
...
Back in #1240 , r1eo linked to information about how this could happen
with older Linux kernels in response to nmap. Bugs #4545 and #4547
are about how our approach to trying to deal with this condition was
broken and stupid. Thanks to wanoskarnet for reminding us about #1240 .
This is a fix for the abovementioned bugs, and is a bugfix on
0.1.0.3-rc.
2011-12-21 11:19:41 -05:00
Nick Mathewson
cefff11950
Merge remote-tracking branch 'sebastian/clang-3.0-fixes_022' into maint-0.2.2
2011-12-16 17:49:41 -05:00
Roger Dingledine
1208c179fb
fix extra words and minor whitespace
2011-12-16 12:47:05 -05:00
Nick Mathewson
b04388f9e7
Copy 0.2.2.35 changelog into releasenotes; fix a date
2011-12-15 13:16:30 -05:00
Nick Mathewson
796563f7f3
Actually merge the CVE-2011-2778 log entry into ChangeLog
2011-12-15 13:14:50 -05:00
Nick Mathewson
7264e0d880
Increment release to 0.2.2.35
2011-12-15 12:02:38 -05:00
Nick Mathewson
d4b935e77f
Changelog for 0.2.2.35
2011-12-15 11:56:26 -05:00
Nick Mathewson
2c70ca0e94
Merge branch 'maint-0.2.2' into release-0.2.2
2011-12-15 11:38:40 -05:00
Nick Mathewson
562c974ee7
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-12-15 11:28:44 -05:00
Nick Mathewson
9d0777839b
Add a fix for the buf_pullup bug that Vektor reported
2011-12-15 11:28:24 -05:00
Nick Mathewson
ed46539050
Merge changes files for 0.2.2.35; start work on a blurb
2011-12-14 16:01:33 -05:00
Sebastian Hahn
bcca541da9
Build with warnings and clang 3.0
...
--enable-gcc-warnings enables two warnings that clang doesn't support,
so the build fails. We had hoped clang 3.0 would add those, but it
didn't, so let's just always disable those warnings when building with
clang. We can still fix it later once they add support
2011-12-13 07:43:53 +01:00
Roger Dingledine
9fdfc10092
Merge branch 'maint-0.2.2' into release-0.2.2
2011-12-08 17:23:58 -05:00
Roger Dingledine
0582746e0d
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-12-08 04:40:15 -05:00
Karsten Loesing
ff2c9acbb3
Update to the December 2011 GeoIP database.
2011-12-08 09:55:44 +01:00
Nick Mathewson
6171bdd105
Don't call tor_tls_set_logged_address till after checking conn->tls
...
Fixes bug 4531; partial backport of e27a26d5
2011-12-02 16:15:52 -05:00
Nick Mathewson
2b5a035604
tor_accept_socket() should take tor_addr_t for listener arg
...
Fixes bug 4535; bugfix on 0.2.2.28-beta; found by "troll_un"
2011-12-02 16:09:16 -05:00
Nick Mathewson
b7015603fa
Fix bug 4530; check return val of tor_addr_lookup correctly
...
Fix on 0.2.1.5-alpha; reported by troll_un
2011-12-02 15:37:24 -05:00
Roger Dingledine
5ad0de1e5d
unify changelog stanzas
2011-11-27 03:52:24 -05:00
Roger Dingledine
52789c863e
fold in one more
2011-11-27 03:35:15 -05:00
Roger Dingledine
57db578b81
Merge branch 'maint-0.2.2' into release-0.2.2
2011-11-27 03:33:11 -05:00
Nick Mathewson
3ebe960f3f
Detect tor_addr_to_str failure in tor_dup_addr.
...
This avoids a possible strdup of an uninitialized buffer.
Fixes 4529; fix on 0.2.1.3-alpha; reported by troll_un.
2011-11-23 23:04:10 -05:00
Nick Mathewson
fbf1c5ee79
Merge remote-tracking branch 'public/bug4230' into maint-0.2.2
2011-11-23 16:22:26 -05:00
Sebastian Hahn
841247a586
Fix a compile warning on 64bit OS X
...
Backport of 68475fc5c5
2011-11-23 12:06:55 -05:00
Roger Dingledine
842a7a8123
fold in more changes files
2011-11-21 19:30:29 -05:00
Roger Dingledine
3f41df3005
Merge branch 'maint-0.2.2' into release-0.2.2
2011-11-21 19:18:09 -05:00
Roger Dingledine
97a209ea28
man page entries for AuthDir{Fast,GuardBW}Guarantee
2011-11-21 18:32:32 -05:00
Roger Dingledine
c0ec4eafc5
parameterize bw cutoffs to guarantee Fast and Guard flags
...
Now it will be easier for researchers to simulate Tor networks with
different values. Resolves ticket 4484.
2011-11-21 18:22:10 -05:00
Nick Mathewson
f4e053d6df
Merge branch 'bug4518' into maint-0.2.2
2011-11-21 17:25:51 -05:00
Nick Mathewson
b3c988f0d7
Merge remote-tracking branch 'public/bug3963' into maint-0.2.2
2011-11-21 10:52:15 -05:00
Roger Dingledine
8955b25fc1
fold in further changes entries
2011-11-20 22:08:12 -05:00
Nick Mathewson
fbcd7c01e7
Changes file for bug4521 backports.
2011-11-20 20:15:13 -05:00
Roger Dingledine
509d7e02e9
Merge branch 'maint-0.2.2' into release-0.2.2
2011-11-20 15:08:07 -05:00
Roger Dingledine
Nick Mathewson
Robert Ransom
Karsten Loesing
Sebastian Hahn