| Commit message (Expand) | Author | Age |
* | Add warning message when a managed proxy dies during configuration. | George Kadianakis | 2012-11-06 |
* | Merge remote-tracking branch 'linus/bug5053-bug5055'•••Conflicts:
src/or/geoip.c
| Nick Mathewson | 2012-11-04 |
|\ |
|
| * | Changes files for tickets 5053 and 5055. | Linus Nordberg | 2012-10-22 |
* | | Avoid c99 designated initializers in circuitmux_ewma.c•••We still want to build on compilers w/o c99 support, such as
(notoriously, shamefully) MSVC.
So I'm commenting out the designated initializers in
circuitmux_ewma.c. The alternative would have been to use some kind
of macros to use designated initializers only when they're
supported, but that's error-prone, and can lead to code having
different meanings under different compilers.
Bug 7286; fix on 0.2.4.4-alpha; spotted by Gisle Vanem.
| Nick Mathewson | 2012-11-02 |
* | | Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/tor | Andrea Shepard | 2012-10-30 |
|\ \ |
|
| * | | Add a copy of OpenBSD's sys/queue.h as tor_queue.h•••There are as many divergent implementations of sys/queue.h as there
are operating systems shipping it, it would seem. They have some code
in common, but have drifted apart, and have added other stuff named
differently. So I'm taking a relatively sane one, and hoping for the
best.
I'm taking OpenBSD's in particular because of the lack of external
dependencies, the presence of a CIRCLEQ (we could use one of those in
places), and the liberal licensing terms.
I'm naming the file tor_queue.h, since historically we've run into
trouble having headers with the same names as system headers (log.h,
for example.)
| Nick Mathewson | 2012-10-12 |
* | | | changes file for bug 7235 | Nick Mathewson | 2012-10-28 |
* | | | Fold in changelog item; draft blurb for 0.2.4.5-alpha | Nick Mathewson | 2012-10-25 |
* | | | Merge branch 'link_negotiation_assert_024' | Nick Mathewson | 2012-10-25 |
|\ \ \ |
|
| * | | | Fix a remotely triggerable assertion failure (CVE-2012-2250)•••If we completed the handshake for the v2 link protocol but wound up
negotiating the wong protocol version, we'd become so confused about
what part of the handshake we were in that we'd promptly die with an
assertion.
This is a fix for CVE-2012-2250; it's a bugfix on 0.2.3.6-alpha.
All servers running that version or later should really upgrade.
Bug and fix from "some guy from France." I tweaked his code slightly
to make it log the IP of the offending node, and to forward-port it to
0.2.4.
| Nick Mathewson | 2012-10-23 |
* | | | | Start an 0.2.4.5 changelog.•••The items from 0.2.3.x are copy-and-pastd from current release-0.2.3
changelog; the others are folded in from changes/*.
| Nick Mathewson | 2012-10-25 |
* | | | | Change changes file and comment for 7189, for making it 0.2.4-only for now | Nick Mathewson | 2012-10-24 |
* | | | | Merge remote-tracking branch 'public/bug7189_tentative' | Nick Mathewson | 2012-10-24 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Only disable TLS tickets when being/acting as a server.•••Fix for bug 7189.
| Nick Mathewson | 2012-10-24 |
| * | | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 | Nick Mathewson | 2012-10-23 |
| |\ \ \ |
|
| | * | | | Add a changes file for bug 7191. | Nick Mathewson | 2012-10-23 |
* | | | | | Use the same changes file for bug7191 as in 0.2.[23] | Nick Mathewson | 2012-10-23 |
* | | | | | Merge remote-tracking branch 'andrea/bug7191_v2' | Nick Mathewson | 2012-10-23 |
|\ \ \ \ \ |
|
| * | | | | | Rewrite smartlist_bsearch_idx() to not be broken for lists of length zero or ... | Andrea Shepard | 2012-10-23 |
* | | | | | | Merge branch 'maint-0.2.3' | Roger Dingledine | 2012-10-23 |
|\ \ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| * | | | | | Let 0.2.3 clients exit to internal addresses if they want•••Clients now consider the ClientRejectInternalAddresses config option
when using a microdescriptor consensus stanza to decide whether
an exit relay would allow exiting to an internal address. Fixes
bug 7190; bugfix on 0.2.3.1-alpha.
| Roger Dingledine | 2012-10-23 |
* | | | | | | Roll enh6876 into Changelog for 0.2.4.4 alpha, which had the change but not t... | Nick Mathewson | 2012-10-23 |
* | | | | | | Merge remote-tracking branch 'linus/enh6876_changes_file' | Nick Mathewson | 2012-10-23 |
|\ \ \ \ \ \ |
|
| * | | | | | | Add changes file for ticket 6876 missing from 0.2.4.4-alpha ChangeLog. | Linus Nordberg | 2012-10-22 |
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.3' | Nick Mathewson | 2012-10-23 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| / / / /
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Fix parse_short_policy (bug 7192.)•••Our implementation of parse_short_policy was screwed up: it would
ignore the last character of every short policy. Obviously, that's
broken.
This patch fixes the busted behavior, and adds a bunch of unit tests
to make sure the rest of that function is okay.
Fixes bug 7192; fix on 0.2.3.1-alpha.
| Nick Mathewson | 2012-10-23 |
| * | | | | | Merge branch 'block_renegotiate_023' into maint-0.2.3 | Nick Mathewson | 2012-10-19 |
| |\ \ \ \ \ |
|
| | * | | | | | Discard extraneous renegotiation attempts in the v3 link protocol•••Failure to do so left us open to a remotely triggerable assertion
failure. Fixes CVE-2012-2249; bugfix on 0.2.3.6-alpha. Reported by
"some guy from France".
| Nick Mathewson | 2012-10-17 |
* | | | | | | | Merge branch 'split_circuitbuild'•••Conflicts:
src/or/circuitbuild.c
There was a huge-looking conflict in circuitbuild.c, but the only
change that had been made to circuitbuild.c since I forked off the
split_circuitbuild branch was 17442560c44e8093f9a. So I took the
split_circuitbuild version of the conflicting part, and manually
re-applied the change from 17442560c44e8093f9a..
| Nick Mathewson | 2012-10-22 |
|\ \ \ \ \ \ \
| |_|_|/ / / /
|/| | | | | | |
|
| * | | | | | | Move the circuit build timeout code into its own file. | Nick Mathewson | 2012-10-15 |
| * | | | | | | Split code for entry guards and bridges into a new module. | Nick Mathewson | 2012-10-15 |
* | | | | | | | fold in changes files for upcoming 0.2.4.4-alpha | Roger Dingledine | 2012-10-20 |
* | | | | | | | Merge branch 'block_renegotiate_024' | Nick Mathewson | 2012-10-19 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Discard extraneous renegotiation attempts in the v3 link protocol•••Failure to do so left us open to a remotely triggerable assertion
failure. Fixes CVE-2012-2249; bugfix on 0.2.3.6-alpha. Reported by
"some guy from France".
This patch is a forward-port to 0.2.4, to work with the new channel
logic.
| Nick Mathewson | 2012-10-17 |
| |/ / / / / / |
|
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.3' | Nick Mathewson | 2012-10-19 |
|\ \ \ \ \ \ \
| | |/ / / / /
| |/| | | | | |
|
| * | | | | | | Don't serve or accept v2 HS descs over a DirPort•••(changes file tweaked by nickm)
| Robert Ransom | 2012-10-19 |
* | | | | | | | Merge remote-tracking branch 'origin/maint-0.2.3' | Nick Mathewson | 2012-10-19 |
|\| | | | | | |
|
| * | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 | Nick Mathewson | 2012-10-19 |
| |\ \ \ \ \ \
| | |_|/ / / /
| |/| | / / /
| | | |/ / /
| | |/| | | |
|
| | * | | | | Disable TLS Session Tickets, which we were apparently getting for free•••OpenSSL 1.0.0 added an implementation of TLS session tickets, a
"feature" that let session resumption occur without server-side state
by giving clients an encrypted "ticket" that the client could present
later to get the session going again with the same keys as before.
OpenSSL was giving the keys to decrypt these tickets the lifetime of
the SSL contexts, which would have been terrible for PFS if we had
long-lived SSL contexts. Fortunately, we don't. Still, it's pretty
bad. We should also drop these, since our use of the extension stands
out with our non-use of session cacheing.
Found by nextgens. Bugfix on all versions of Tor when built with
openssl 1.0.0 or later. Fixes bug 7139.
| Nick Mathewson | 2012-10-19 |
| * | | | | | Don't call fmt_addr() twice in a parameter list. | George Kadianakis | 2012-10-09 |
* | | | | | | Remove changes/bug7129•••Our convention is that we use the changelog to note release-to-release
changes; we don't need to add changelog entries for bugs that didn't
appear in any released version of Tor. (By convention, we sometimes
say "this bug does not appear in any released version of Tor" or words
to that effect in the commit message so that when Roger goes to make
sure the changelog is right, he knows not to expect a changelog entry
for that part.)
| Nick Mathewson | 2012-10-17 |
* | | | | | | Add changes file for bug 7129 | Andrea Shepard | 2012-10-17 |
| |_|/ / /
|/| | | | |
|
* | | | | | Merge remote-tracking branch 'public/bug1031' | Nick Mathewson | 2012-10-15 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Changes file for bug 1031 (reserved C identifiers) | Nick Mathewson | 2012-10-12 |
| | |_|/
| |/| | |
|
* | | | | Merge remote-tracking branch 'arma/bug7029' | Nick Mathewson | 2012-10-14 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Free some more still-in-use memory at exit | Roger Dingledine | 2012-10-03 |
* | | | | Make tor_addr_is_internal log the calling function on error•••This might make it a little easier to track down bug 7086.
| Nick Mathewson | 2012-10-12 |
* | | | | Move all externally maintained source files into src/ext•••The rationale for treating these files differently is that we should
be checking upstream for changes as applicable, and merging changes
upstream as warranted.
| Nick Mathewson | 2012-10-11 |
* | | | | Merge branch 'bug7011'•••Conflicts:
src/or/circuitbuild.c
The conflict was trivial, since no line of code actually changed in
both branches: There was a fmt_addr() that turned into fmt_addrport()
in bug7011, and a "if (!n_conn)" that turned into "if (!n_chan)" in
master.
| Nick Mathewson | 2012-10-10 |
|\ \ \ \ |
|
| * | | | | Fix changes/bug7011 slightly | Nick Mathewson | 2012-10-10 |