Nick Mathewson
095080360f
Merge branch 'maint-0.2.5' into release-0.2.5
2014-10-19 21:38:17 -04:00
Nick Mathewson
fd8f21e730
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-10-19 15:40:07 -04:00
Nick Mathewson
403c6ae78e
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-10-19 15:39:48 -04:00
Nick Mathewson
c1dd598df8
Note that our #13426 fix is also a #13471 fix.
...
See also http://marc.info/?l=openssl-dev&m=141357408522028&w=2
2014-10-19 15:38:44 -04:00
Nick Mathewson
9ffb2d8818
Change 0.2.5.9 to 0.2.5.9-rc in the changelog; write a draft blurb
2014-10-19 14:25:45 -04:00
Nick Mathewson
42336f32f0
Sort and collate the ReleaseNotes sections again.
2014-10-19 14:21:43 -04:00
Nick Mathewson
6a58a380f9
Recategorize some uncategorized things in the releasenotes
2014-10-19 14:17:34 -04:00
Nick Mathewson
e6c16e6267
Move around some entries in the ReleaseNotes between sections
2014-10-19 13:25:22 -04:00
Nick Mathewson
6880aaf0a9
Automatically sort and collate ReleaseNotes.
...
No entries have been removed or edited or added in this commit; no
section names have been changed. We may need another round of
removal/editing/etc after we edit some section names. We may want to
re-order items within sections.
2014-10-19 12:56:12 -04:00
Nick Mathewson
dfcdb34b8e
Copy 0.2.5.9 entries into ReleaseNotes
2014-10-19 12:55:05 -04:00
Nick Mathewson
f17167ac0a
Tidy an entry in the 0259 changelog. Now I like the entries.
2014-10-19 12:53:56 -04:00
Nick Mathewson
96f46922c7
Format_changelog on the 0.2.5.9 changelog
2014-10-19 12:52:24 -04:00
Nick Mathewson
c82aaaa48a
Copy changes/* into the ChangeLog file for 0.2.5.9
2014-10-19 12:50:12 -04:00
Nick Mathewson
f77d8901fc
Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
2014-10-19 11:13:09 -04:00
Nick Mathewson
ab4b29625d
Downgrade 'unexpected sendme cell from client' to PROTOCOL_WARN
...
Closes 8093.
2014-10-16 13:04:11 -04:00
Nick Mathewson
22b9caf0ae
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-10-16 09:08:52 -04:00
Nick Mathewson
943fd4a252
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-10-16 09:08:32 -04:00
Nick Mathewson
c1c83eb376
Merge branch 'no_sslv3_023' into maint-0.2.3
2014-10-16 09:08:09 -04:00
Nick Mathewson
af73d3e4d8
Disable SSLv3 unconditionally. Closes ticket 13426.
...
The POODLE attack doesn't affect Tor, but there's no reason to tempt
fate: SSLv3 isn't going to get any better.
2014-10-15 11:50:05 -04:00
Nick Mathewson
d315b8e8bc
Merge remote-tracking branch 'public/bug13325_024' into maint-0.2.5
2014-10-03 19:57:41 -04:00
Nick Mathewson
d1fa0163e5
Run correctly on OpenBSD systems without SSL_METHOD.get_cipher_by_char
...
Also, make sure we will compile correctly on systems where they
finally rip it out.
Fixes issue #13325 . Caused by this openbsd commit:
http://marc.info/?l=openbsd-cvs&m=140768179627976&w=2
Reported by Fredzupy.
2014-10-03 12:15:09 -04:00
Nick Mathewson
e1a25f0c36
Merge branch 'bug13295_v2_025' into maint-0.2.5
2014-09-29 13:02:35 -04:00
Nick Mathewson
09951bea7f
Don't use the getaddrinfo sandbox cache from tor-resolve
...
Fixes bug 13295; bugfix on 0.2.5.3-alpha.
The alternative here is to call crypto_global_init() from tor-resolve,
but let's avoid linking openssl into tor-resolve for as long as we
can.
2014-09-29 12:57:07 -04:00
Roger Dingledine
a64f3ab3ee
put an ordering on 0.2.4.24 vs 0.2.5.8-rc
2014-09-22 14:19:34 -04:00
Roger Dingledine
36b979bb8d
bump version to 0.2.5.8-rc
2014-09-22 14:01:50 -04:00
Roger Dingledine
347a9f98b8
commit my in-progress 0.2.5.x release notes
...
they're far from done, but this way i won't lose them
2014-09-21 16:23:48 -04:00
Roger Dingledine
9fe7395984
merge in the next changes entry
2014-09-20 17:11:43 -04:00
Roger Dingledine
70762a0e9c
Merge branch 'maint-0.2.5' into release-0.2.5
2014-09-20 16:51:41 -04:00
Roger Dingledine
87576e826f
Merge branch 'maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/config.c
2014-09-20 16:50:32 -04:00
Roger Dingledine
288b3ec603
Merge branch 'maint-0.2.3' into maint-0.2.4
2014-09-20 16:49:24 -04:00
Sebastian Hahn
0eec8e2aa5
gabelmoo's IPv4 address changed
2014-09-20 16:46:02 -04:00
Roger Dingledine
22a82164b1
fold in existing changes entry
2014-09-19 21:45:14 -04:00
Roger Dingledine
0b004ba5c0
Merge branch 'maint-0.2.5' into release-0.2.5
2014-09-19 21:44:23 -04:00
Nick Mathewson
be0e26272b
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2014-09-16 11:10:02 -04:00
Roger Dingledine
0c3b3650aa
clients now send correct address for rendezvous point
...
Clients now send the correct address for their chosen rendezvous point
when trying to access a hidden service. They used to send the wrong
address, which would still work some of the time because they also
sent the identity digest of the rendezvous point, and if the hidden
service happened to try connecting to the rendezvous point from a relay
that already had a connection open to it, the relay would reuse that
connection. Now connections to hidden services should be more robust
and faster. Also, this bug meant that clients were leaking to the hidden
service whether they were on a little-endian (common) or big-endian (rare)
system, which for some users might have reduced their anonymity.
Fixes bug 13151; bugfix on 0.2.1.5-alpha.
2014-09-16 11:05:36 -04:00
Nick Mathewson
396ac67f62
Merge branch 'maint-0.2.5' into release-0.2.5
...
This is a "theirs" merge, to get the version number bumped to
0.2.5.7-rc-dev.
2014-09-11 21:44:03 -04:00
Nick Mathewson
550c03336c
Bump maint-0.2.5 to 0.2.5.7-rc-dev
2014-09-11 21:38:32 -04:00
Roger Dingledine
40233cadbb
0.2.5.7-rc is not the first release candidate for 0.2.5.7-rc
2014-09-11 20:26:38 -04:00
Nick Mathewson
76f72e3b41
Add a release blurb and increment the version in the changelog.
...
(Remember, this isn't the final release until it's tagged.)
2014-09-11 11:33:36 -04:00
Nick Mathewson
5958261f23
Remove bug12693 changelog entry.
...
It looks like this was stale and sitting around uncommitted in my
changes directory, having not been committed on my bug12693_025
branch. The fix for bug12693_025 is not in fact merged.
2014-09-11 11:23:47 -04:00
Nick Mathewson
102c7d7b2c
Edit changelog a bit.
2014-09-11 11:23:19 -04:00
Nick Mathewson
2fbaa2f9d6
Fold changes entries into 0.2.5.7 changelog
2014-09-11 09:12:42 -04:00
Nick Mathewson
8e7ee0e2c0
Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
2014-09-11 09:08:50 -04:00
Roger Dingledine
6215ebb266
Reduce log severity for unused ClientTransportPlugin lines
...
Tor Browser includes several ClientTransportPlugin lines in its
torrc-defaults file, leading every Tor Browser user who looks at her
logs to see these notices and wonder if they're dangerous.
Resolves bug 13124; bugfix on 0.2.5.3-alpha.
2014-09-11 08:02:37 -04:00
Nick Mathewson
3c2c6a6116
In routerlist_assert_ok(), check r2 before taking &(r2->cache_info)
...
Technically, we're not allowed to take the address of a member can't
exist relative to the null pointer. That makes me wonder how any sane
compliant system implements the offsetof macro, but let's let sleeping
balrogs lie.
Fixes 13096; patch on 0.1.1.9-alpha; patch from "teor", who was using
clang -fsanitize=undefined-trap -fsanitize-undefined-trap-on-error -ftrapv
2014-09-10 23:48:11 -04:00
Nick Mathewson
a9b2e5eac6
Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
2014-09-10 22:12:47 -04:00
Nick Mathewson
8eed82b3d4
Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
2014-09-09 11:04:54 -04:00
Nick Mathewson
351f245e2a
Add new changes entries to 0.2.5.7-rc changelog
2014-09-09 10:54:50 -04:00
Nick Mathewson
04755ff764
Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
2014-09-09 10:52:21 -04:00
Nick Mathewson
dd22ab519a
Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5
2014-09-09 10:51:39 -04:00
Nick Mathewson
Roger Dingledine
Sebastian Hahn