Nick Mathewson
9e9edf71f7
Split code for entry guards and bridges into a new module.
2012-10-15 14:28:23 -04:00
Nick Mathewson
9f83142591
Merge remote-tracking branch 'public/bug1031'
2012-10-15 11:20:48 -04:00
Nick Mathewson
0d946e1773
Merge remote-tracking branch 'arma/bug7029'
2012-10-14 23:06:43 -04:00
Nick Mathewson
b555388dac
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.)
2012-10-12 17:18:14 -04:00
Nick Mathewson
30e2d41a65
Changes file for bug 1031 (reserved C identifiers)
2012-10-12 12:28:47 -04:00
Nick Mathewson
8586611718
Make tor_addr_is_internal log the calling function on error
...
This might make it a little easier to track down bug 7086.
2012-10-12 11:34:54 -04:00
Nick Mathewson
63f542a5c2
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.
2012-10-11 17:22:03 -04:00
Nick Mathewson
7ea904cbc0
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.
2012-10-10 22:31:06 -04:00
Nick Mathewson
e6d1ab3600
Fix changes/bug7011 slightly
2012-10-10 22:27:52 -04:00
David Fifield
6e31b9c503
Add changes file for bug7011.
2012-10-10 22:25:30 -04:00
Andrea Shepard
8b36d4cc2a
Merge branch 'bug6816_squashed_nowarn' of git://git.torproject.org/nickm/tor
2012-10-10 18:53:38 -07:00
Andrea Shepard
cf994f7ad7
Add changes file for bug6816
2012-10-10 00:51:55 -07:00
George Kadianakis
634d24c588
Don't call fmt_addr() twice in a parameter list.
2012-10-09 23:49:56 -04:00
George Kadianakis
721f99e495
Don't call fmt_addr() twice in a parameter list.
2012-10-09 23:46:04 -04:00
Andrea Shepard
b1b33f15be
Add changes file for channels (ticket 6465)
2012-10-08 03:06:09 -07:00
Roger Dingledine
0b598cb2bb
Say "KBytes" rather than "KB" in the man page
...
(for various values of K), to further reduce confusion about whether
Tor counts in units of memory or fractions of units of memory. Fixes
bug 7054.
2012-10-06 01:57:13 -04:00
Roger Dingledine
016c21d871
Downgrade "Failed to hand off onionskin" messages
...
They're typically redundant with the "Your computer is too slow"
messages. Fixes bug 7038; bugfix on 0.2.2.16-alpha.
(In retrospect, we should have fixed this bug back in ticket 1042.)
2012-10-05 13:35:13 -04:00
Nick Mathewson
751b3aabb5
Merge remote-tracking branch 'public/openssl_1_is_best'
2012-10-04 12:50:41 -04:00
Nick Mathewson
be33c3f600
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-10-04 12:49:13 -04:00
Nick Mathewson
0a3dfd0423
Merge remote-tracking branch 'arma/bug7037' into maint-0.2.3
2012-10-04 12:46:33 -04:00
Nick Mathewson
d92d3f3335
Add autoconf magic to support Bitrig
...
Bitrig is an openbsd fork. Patch from dhill. Ticket 6982.
2012-10-04 10:56:33 -04:00
Nick Mathewson
03e4b5a9d7
Merge remote-tracking branch 'linus/bug6757'
2012-10-04 10:31:25 -04:00
Nick Mathewson
d9847165e0
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-10-04 10:05:55 -04:00
Roger Dingledine
10b43f4c46
pass the reason from the truncated cell to the controller
...
(rather than just always declaring that the reason is
END_CIRC_REASON_OR_CONN_CLOSED)
resolves bug 7039.
2012-10-03 23:56:34 -04:00
Roger Dingledine
e50fa0d6cb
Refuse extra create cells with reason "resource limit"
...
In the past we had used reason "internal", which is more vague than
it needs to be. Resolves bug 7037.
2012-10-03 20:17:37 -04:00
Roger Dingledine
b1971d89c8
properly free the return values of rate_limit_log()
...
resolves bug 7022.
2012-10-03 13:15:27 -04:00
Roger Dingledine
3d31771da9
Free some more still-in-use memory at exit
2012-10-03 12:46:09 -04:00
Nick Mathewson
a80d8e09d3
The --version option should imply --quiet.
...
Patch from 'maker'.
2012-10-01 11:01:18 -04:00
Nick Mathewson
95d9f7e9cc
Merge remote-tracking branch 'rransom/warn-about-hses-without-guards'
2012-09-25 12:39:00 -04:00
Roger Dingledine
dc014c9747
Merge branch 'maint-0.2.3'
2012-09-22 09:31:09 -04:00
Roger Dingledine
c88a4c51b4
add faravahar as our ninth v3 dir auth
2012-09-22 09:10:37 -04:00
Roger Dingledine
e132704466
fold in changes files
2012-09-22 06:06:36 -04:00
Nick Mathewson
9d4c53534d
Remove the testing_since* fields
...
They weren't actually used since 7a35dad00
Bug 5809
2012-09-21 22:05:09 -04:00
Nick Mathewson
b7fdb3a927
add changes file and whitespace fixes for bug 4020
2012-09-21 19:48:38 -04:00
Linus Nordberg
ce553d4982
Have node_get_pref_orport() return an IPv6 OR port when UseBridges is set.
...
We used to never return an IPv6 address unless ClientUseIPv6 was
set. We should allow clients running with bridges use IPv6 OR ports
even without setting ClientUseIPv6. Configuring an IPv6 address in a
Bridge line should imply that.
Fixes th second part of #6757 .
2012-09-19 17:18:06 +02:00
Nick Mathewson
0e0a167742
Merge branch 'bug6843'
2012-09-19 09:01:15 -04:00
Nick Mathewson
f612a9eb1b
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-19 08:26:07 -04:00
Nick Mathewson
b9c86948e4
Clarify that hidden services are TCP only
...
Also remove some trailing whitespace.
Patch from maker; fixes bug 6024.
2012-09-19 08:19:21 -04:00
Robert Ransom
130e899fbb
Warn if HSes are configured on a client with UseEntryGuards disabled
2012-09-18 16:50:00 -04:00
Nick Mathewson
9d3e497edb
Note a bug number for 6888
2012-09-18 16:22:12 -04:00
Mike Perry
acda1735fd
Disable Guard usage for Tor2webMode.
...
Tor2webMode is fingerprintable by hidden services through repeated
usage of the same three guard nodes for its rend and intro points.
2012-09-18 16:21:35 -04:00
Nick Mathewson
920c76a2fc
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-18 16:20:01 -04:00
Nick Mathewson
f675e0a33e
specify a version for the bug6884 changes file
2012-09-18 15:54:36 -04:00
Nick Mathewson
c35fad2bde
Remove some deadcode for parsing v1 directories
...
Fixes bug 6887. There are opportunities to remove more functions if
authorities can stop serving dummy v1 directory documents
2012-09-18 15:30:27 -04:00
Linus Nordberg
a989dbc3dc
Print the correct address family in log printout.
...
Look at the address family of the preferred OR port rather than the
node.ipv6_preferred flag since the logic has changed with new
ClientUseIPv6 config option.
Fixes ticket 6884.
2012-09-18 14:41:14 +02:00
Mike Perry
4bfed4378d
Bug 6866: Convert pathbias asserts into log messages.
...
Asserts were hit by Tor2Web mode.
2012-09-17 18:25:28 -07:00
Nick Mathewson
5dfec9f833
Merge remote-tracking branch 'linus/bug6880'
2012-09-17 16:05:09 -04:00
Linus Nordberg
bee1e46bd1
Don't do reachability testing over IPv6 unless AuthDirPublishIPv6 is set.
...
This affects both directory authorities and bridge authoritites.
2012-09-17 22:01:58 +02:00
Nick Mathewson
32d9cea289
Merge remote-tracking branch 'public/bug6853'
2012-09-17 10:50:48 -04:00
Nick Mathewson
5511d21d2b
Merge branch 'bug6861_typofix'
2012-09-17 10:28:35 -04:00