Nick Mathewson
9556668f5f
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-04-15 14:52:12 -04:00
Nick Mathewson
f3c20a28ab
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/circuituse.c
2014-04-15 14:51:19 -04:00
Nick Mathewson
b2106956e0
Don't send uninitialized stack to the controller and say it's a date.
...
Fixes bug 11519, apparently bugfix on 0.2.3.11-alpha.
2014-04-14 21:51:30 -04:00
Nick Mathewson
bc4c966851
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-04-14 18:00:54 -04:00
Nick Mathewson
149931571a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/routerlist.h
2014-04-14 18:00:38 -04:00
Nick Mathewson
09ed8a5dbb
Tweak changes file and comment dates.
2014-04-14 17:58:49 -04:00
Nick Mathewson
50ad393924
Code to blacklist authority signing keys
...
(I need a list of actual signing keys to blacklist.)
2014-04-14 17:57:39 -04:00
Nick Mathewson
a790454368
Demote "we stalled too much while trying to write" message to INFO
...
Resolves ticket 5286.
2014-04-09 11:34:00 -04:00
Nick Mathewson
fa6b80d6e5
Merge remote-tracking branch 'public/bug10431'
2014-04-09 08:29:21 -04:00
Nick Mathewson
88179bd9b6
Merge remote-tracking branch 'public/update_ciphers_ff28'
2014-04-08 20:43:21 -04:00
Nick Mathewson
53676e71b5
Start work on the changelog for 0.2.5.4-alpha
...
This commit does nothing other than pull the changes/* files into
ChangeLog, sorted by declared type. I haven't comined any entries or
vetted anything yet.
2014-04-08 20:34:23 -04:00
Nick Mathewson
6a0dc0e585
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-04-08 20:30:30 -04:00
Nick Mathewson
08ced4a7bf
Merge remote-tracking branch 'public/bug11426'
2014-04-08 16:46:34 -04:00
Nick Mathewson
689863d0a9
Merge branch 'bug2454_025_squashed'
2014-04-08 15:37:15 -04:00
Matthew Finkel
2d5a7b1842
Check for new IP addr after circuit liveliness returns
...
When we successfully create a usable circuit after it previously
timed out for a certain amount of time, we should make sure that
our public IP address hasn't changed and update our descriptor.
2014-04-08 15:37:01 -04:00
Nick Mathewson
245f273aaf
Merge branch 'bug7952_final'
...
Conflicts:
src/test/include.am
src/test/test.c
2014-04-08 13:55:02 -04:00
rl1987
51e13cd1ad
Making entire exit policy available to Tor controller.
2014-04-08 13:50:02 -04:00
Nick Mathewson
3ac426afe8
Merge remote-tracking branch 'public/bug4241'
2014-04-08 12:41:03 -04:00
Nick Mathewson
fffc59b0e9
Merge remote-tracking branch 'public/bug9841_025'
2014-04-08 12:06:03 -04:00
Nick Mathewson
4231729176
Update ciphers.inc to match ff28
...
The major changes are to re-order some ciphers, to drop the ECDH suites
(note: *not* ECDHE: ECDHE is still there), to kill off some made-up
stuff (like the SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA suite), to drop
some of the DSS suites... *and* to enable the ECDHE+GCM ciphersuites.
This change is autogenerated by get_mozilla_ciphers.py from
Firefox 28 and OpenSSL 1.0.1g.
Resolves ticket 11438.
2014-04-08 11:42:07 -04:00
Nick Mathewson
ab1a679eef
Fix a small memory leak when resolving PTR addresses
...
Fixes bug 11437; bugfix on 0.2.4.7-alpha.
Found by coverity; this is CID 1198198.
2014-04-07 23:29:47 -04:00
Nick Mathewson
f0bce2dc35
Fix some harmless/untriggerable memory leaks found by coverity
2014-04-07 23:20:13 -04:00
Nick Mathewson
595303fd1e
Merge remote-tracking branch 'public/bug10363_024_squashed'
2014-04-07 23:03:04 -04:00
Nick Mathewson
6d9c332757
Another 10363 instance -- this one in the eventdns.c code
2014-04-07 22:56:42 -04:00
Nick Mathewson
9dd115d6b5
Another 10363 instance: this one in tor_memmem fallback code
2014-04-07 22:56:42 -04:00
Nick Mathewson
092ac26ea2
Fix undefined behavior with pointer addition in channeltls.c
...
In C, it's a bad idea to do this:
char *cp = array;
char *end = array + array_len;
/* .... */
if (cp + 3 >= end) { /* out of bounds */ }
because cp+3 might be more than one off the end of the array, and
you are only allowed to construct pointers to the array elements,
and to an element one past the end. Instead you have to say
if (cp - array + 3 >= array_len) { /* ... */ }
or something like that.
This patch fixes two of these: one in process_versions_cell
introduced in 0.2.0.10-alpha, and one in process_certs_cell
introduced in 0.2.3.6-alpha. These are both tracked under bug
10363. "bobnomnom" found and reported both. See also 10313.
In our code, this is likely to be a problem as we used it only if we
get a nasty allocator that makes allocations end close to (void*)-1.
But it's best not to have to worry about such things at all, so
let's just fix all of these we can find.
2014-04-07 22:56:42 -04:00
Nick Mathewson
74195db6b6
Changes file for bug9665
2014-04-07 22:19:56 -04:00
Nick Mathewson
9ccedbece0
Make csiphash use the proper endian-converter on solaris
...
fixes bug 11426; bugfix on 0.2.5.3-alpha, where csiphash was
introduced.
2014-04-07 13:07:14 -04:00
Nick Mathewson
bc0882c868
Merge remote-tracking branch 'public/bug9650'
2014-04-05 14:53:48 -04:00
Nick Mathewson
2ff664ee20
Merge remote-tracking branch 'public/bug10801_024'
...
Conflicts:
src/common/address.c
src/or/config.c
2014-04-05 14:50:57 -04:00
Nick Mathewson
24c4b56a39
Merge remote-tracking branch 'public/bug10081'
2014-04-02 15:45:20 -04:00
Nick Mathewson
2f59d6e2d8
Drop MAX_REND_FAILURES to 8
2014-04-02 15:36:13 -04:00
Nick Mathewson
17d5734df4
Merge remote-tracking branch 'public/bug11278'
2014-04-01 21:56:49 -04:00
Nick Mathewson
86f619d0d3
Merge remote-tracking branch 'public/bug10468_024'
2014-04-01 21:50:55 -04:00
Nick Mathewson
fc9e84062b
Merge remote-tracking branch 'public/bug4645'
...
Conflicts:
src/or/dirserv.c
2014-04-01 21:49:01 -04:00
Nick Mathewson
dfc32177d9
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-04-01 21:00:30 -04:00
Nick Mathewson
a68e6ea9c0
Fix documentation of torrc search order
...
We are searching @CONFDIR@ before $HOME, but the documentation
implied otherwise.
I screwed this up in f5e86bcd6c
2014-04-01 20:56:03 -04:00
Nick Mathewson
b4b91864bb
Merge remote-tracking branch 'public/bug9870'
...
Conflicts:
src/or/config.c
2014-04-01 20:48:15 -04:00
Nick Mathewson
6bef082d0a
Merge remote-tracking branch 'public/bug11232'
2014-04-01 09:39:48 -04:00
Nick Mathewson
c0441cca8b
Merge branch 'bug8787_squashed'
2014-03-31 11:57:56 -04:00
Nick Mathewson
3118af2d5f
changes file for bug8787
2014-03-31 11:57:40 -04:00
Nick Mathewson
4ebad0d947
Merge remote-tracking branch 'public/build_torrify_manpage_again'
2014-03-31 10:52:09 -04:00
Nick Mathewson
f82e499aa5
Merge remote-tracking branch 'public/bug11342'
2014-03-31 10:51:09 -04:00
Nick Mathewson
bfe783f167
Make dump_desc() use binary mode
...
Otherwise, it could mung the thing that came over the net on windows,
which would defeat the purpose of recording the unparseable thing.
Fixes bug 11342; bugfix on 0.2.2.1-alpha.
2014-03-27 23:53:03 -04:00
Nick Mathewson
46a3914079
Respond to AAAA requests on DNSPort with AAAA automaps
...
Other DNS+IPv6 problems remain, but at least this fixes the
automapping.
Fixes bug 10468; bugfix on 0.2.4.7-alpha.
2014-03-27 17:41:43 -04:00
Nick Mathewson
753a246a14
check outputs from get_first_listener_addrport_string
...
Fix for 9650; bugfix for 0.2.3.16-alpha.
2014-03-27 17:12:01 -04:00
Nick Mathewson
b0bbe6b2f1
Report only the first bootstrap failure from an orconn
...
Otherwise, when we report "identity mismatch", we then later report
DONE when the connection gets closed.
Fixes bug 10431; bugfix on 0.2.1.1-alpha.
2014-03-27 15:58:43 -04:00
Nick Mathewson
9c0a1adfa2
Don't do a DNS lookup on a bridge line address
...
Fixes bug 10801; bugfix on 07bf274d
2014-03-27 15:31:29 -04:00
Nick Mathewson
2721246f5d
Merge branch 'bug7164_diagnose_harder_v2'
2014-03-27 14:26:21 -04:00
Nick Mathewson
0389d4aa56
More logs to try to diagnose bug 7164
...
This time, check in microdesc_cache_clean() to see what could be
going wrong with an attempt to clean a microdesc that's held by a node.
2014-03-27 14:23:19 -04:00
Nick Mathewson
Matthew Finkel
rl1987