Nick Mathewson
d290e36576
Fix make_socket_reusable() on windows. Bug not in any released Tor
2014-04-02 21:11:45 -04:00
Nick Mathewson
24c4b56a39
Merge remote-tracking branch 'public/bug10081'
2014-04-02 15:45:20 -04:00
Nick Mathewson
da908a593f
Unit tests for connection_edge_process_resolved_cell
...
Also rename a function to be more accurate (resolve->resolved)
2014-04-02 15:38:00 -04:00
Nick Mathewson
4215c801ff
Tests for resolved_cell_parse
2014-04-02 15:38:00 -04:00
Nick Mathewson
c230ff4ca9
Look at all of a RESOLVED cell; not just the first answer.
...
Also, stop accepting the old kind of RESOLVED cells with no TTL
fields; they haven't been sent since 0.1.1.6-alpha.
This patch won't work without the fix to #10468 -- it will break
DNSPorts unless they set the proper ipv4/6 flags on entry_connection_t.
2014-04-02 15:38:00 -04:00
Nick Mathewson
2f59d6e2d8
Drop MAX_REND_FAILURES to 8
2014-04-02 15:36:13 -04:00
Nick Mathewson
4fb3ae69a6
Extract code to handle RESOLVED cells
...
No other changes have been made; only code has been moved.
2014-04-01 23:30:41 -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
408bd98e79
Add one more missing heck on bug4645 fixes
2014-04-01 21:10:14 -04:00
Nick Mathewson
dfc32177d9
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-04-01 21:00:30 -04:00
Nick Mathewson
48578e1512
Merge branch 'bug9213_doc_024' into maint-0.2.4
2014-04-01 20:59:13 -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
, when I
first documented the $HOME/.torrc possibility.
Fix for bug 9213; bugfix on 0.2.3.18-rc.
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
1a9b4bd28c
Munmap the right pointers in routerlist_free()
2014-03-31 11:43:51 -04:00
Nick Mathewson
449b87791d
NULL out all mappings after tor_munmap_file()
2014-03-31 11:42:49 -04:00
Nick Mathewson
8e94d5f22e
Check return values for tor_munmap_file() in unit tests
2014-03-31 11:40:00 -04:00
Nick Mathewson
7cdb50e866
Handle tor_munmap_file(NULL) consistently
2014-03-31 11:35:39 -04:00
Andrea Shepard
dea8190111
Check strftime() return in tortls.c
2014-03-31 11:27:08 -04:00
Andrea Shepard
0938c20fa3
Eliminate lseek() with unchecked return in tor_mmap_file()
2014-03-31 11:27:08 -04:00
Andrea Shepard
abdf1878a3
Always check returns from unlink()
2014-03-31 11:27:08 -04:00
Andrea Shepard
df076eccfa
Always check returns from tor_munmap_file() in microdesc.c
2014-03-31 11:27:08 -04:00
Andrea Shepard
947a6daa31
Always check returns from tor_munmap_file() in routerlist.c
2014-03-31 11:27:08 -04:00
Andrea Shepard
389251eda9
Add return value and assert for null parameter to tor_munmap_file()
2014-03-31 11:27:08 -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
5e0cfba969
Fix a clang compilation warning
...
Subtracting two time_t values was yielding something that maybe
can't be fit in an int.
Bugfix on 0389d4aa; bug not in any released Tor.
2014-03-31 10:07:42 -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
234dfb0c65
Better log message when writing a CR in text mode on windows
...
Help to diagnose #11233
2014-03-27 23:48:17 -04:00
Nick Mathewson
9efd970dd9
Merge branch 'bug9658_refactor'
2014-03-27 23:00:28 -04:00
Nick Mathewson
6ad7f3417c
Renamed "onionskins_completed" to "onionskins_assigned"
...
This improves the accuracy of the function/variable names.
2014-03-27 22:57:53 -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
0f395a7c06
Merge remote-tracking branch 'origin/maint-0.2.4'
2014-03-27 15:35:11 -04:00
Nick Mathewson
24e0b1088a
whitespace fix
2014-03-27 15:34:57 -04:00
Nick Mathewson
9c0a1adfa2
Don't do a DNS lookup on a bridge line address
...
Fixes bug 10801; bugfix on 07bf274d
in 0.2.0.1-alpha.
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
de9de9e7dd
Give specific warnings when client-side onionskin handshakes fail
...
Fix for bug9635.
2014-03-27 14:15:53 -04:00
Nick Mathewson
60abc4804f
Don't warn when setsockopt(SO_REUSEABLE) on accept()ed socket says EINVAL
...
This should fix bug10081. I believe this bug pertains to OSX
behavior, not any Tor behavior change.
2014-03-27 13:55:18 -04:00
Nick Mathewson
5b36f0d7e7
Log descriptor-download bootstrapping messages less verbosely
...
This is a fix for 9963. I say this is a feature, but if it's a
bugfix, it's a bugfix on 0.2.4.18-rc.
Old behavior:
Mar 27 11:02:19.000 [notice] Bootstrapped 50%: Loading relay descriptors.
Mar 27 11:02:20.000 [notice] Bootstrapped 51%: Loading relay descriptors.
Mar 27 11:02:20.000 [notice] Bootstrapped 52%: Loading relay descriptors.
... [Many lines omitted] ...
Mar 27 11:02:29.000 [notice] Bootstrapped 78%: Loading relay descriptors.
Mar 27 11:02:33.000 [notice] We now have enough directory information to build circuits.
New behavior:
Mar 27 11:16:17.000 [notice] Bootstrapped 50%: Loading relay descriptors
Mar 27 11:16:19.000 [notice] Bootstrapped 55%: Loading relay descriptors
Mar 27 11:16:21.000 [notice] Bootstrapped 60%: Loading relay descriptors
Mar 27 11:16:21.000 [notice] Bootstrapped 65%: Loading relay descriptors
Mar 27 11:16:21.000 [notice] Bootstrapped 70%: Loading relay descriptors
Mar 27 11:16:21.000 [notice] Bootstrapped 75%: Loading relay descriptors
Mar 27 11:16:21.000 [notice] We now have enough directory information to build circuits.
2014-03-27 11:23:53 -04:00
Nick Mathewson
cd15172444
Fix version number in changes/bug11296
2014-03-26 14:10:07 -04:00
Nick Mathewson
91f6a422cc
Fix build of torify.1
...
The build was broken by changes in f8c45339f7
, but we didn't
notice, since that commit also made torify.1 only get built when
tor-fw-helper was turned on.
Fixes bug 11321; bugfix on Tor 0.2.5.1-alpha.
2014-03-26 12:12:54 -04:00
Nick Mathewson
0b43c499b2
Merge remote-tracking branch 'public/bug11296'
2014-03-26 11:46:51 -04:00
Nick Mathewson
6da2544f20
Turn off testing code for #9683 .
...
(This wasn't supposed to get committed turned-on.)
2014-03-26 10:31:56 -04:00