Nick Mathewson
522e90d661
Changes file for new DNS caching options
2012-12-17 14:49:38 -05:00
Nick Mathewson
cfa07f397d
Note that fallback_dirsource was proposal 206, bug 572.
2012-12-13 12:47:46 -05:00
Nick Mathewson
01ac961ca1
Merge branch 'fallback_dirsource_v3'
2012-12-13 12:42:29 -05:00
Nick Mathewson
21b5d76aa5
Mention that dist-geoip6 was bug 7655
2012-12-11 18:11:49 -05:00
Nick Mathewson
3fa9151f26
Merge branch 'win64-7260'
...
Conflicts:
src/or/dns.c
2012-12-07 14:12:17 -05:00
Nick Mathewson
f366b0112e
Merge remote-tracking branch 'karsten/task-6266'
2012-12-07 11:39:56 -05:00
Nick Mathewson
81fcebcd05
Merge branch 'bug7306'
2012-12-07 11:11:26 -05:00
Nick Mathewson
025dc19b63
Merge remote-tracking branch 'public/bug6887'
2012-12-07 11:02:27 -05:00
Mike Perry
42e3c04a7a
Bug 3443: Don't count ORconn setup in circuit build time.
...
Also, add a hack Roger suggested where we're more patient if no circuits are
opened yet.
2012-12-07 10:34:09 -05:00
Nick Mathewson
f742b33d85
Drop FallbackNetworkstatusFile; it never worked.
2012-12-06 11:28:49 -05:00
Nick Mathewson
90f6071d8d
New FallbackDir option to add extra directories for bootstraping
...
This replaces the old FallbackConsensus notion, and should provide a
way -- assuming we pick reasonable nodes! -- to give clients
suggestions of placs to go to get their first consensus.
2012-12-06 11:28:49 -05:00
Nick Mathewson
ded70363a7
Rename DirServer to DirAuthority
2012-12-06 11:23:43 -05:00
Nick Mathewson
b326e76144
Use FreeLibrary, not CloseHandle, for library in test_util.c
...
Fix for bug 7306. Bugfix on 0.2.2.17-alpha.
2012-12-06 10:59:02 -05:00
Karsten Loesing
c718921d34
Update to the December 2012 GeoIP database.
2012-12-06 11:29:47 +01:00
Nick Mathewson
190c1d4981
Merge branch 'bug7013_take2_squashed'
2012-11-27 22:18:16 -05:00
George Kadianakis
f88c303869
Add a torrc option to specify the bind address of managed proxies.
2012-11-27 22:18:08 -05:00
Karsten Loesing
35d09dd6ac
Update to the November 2012 GeoIP database.
2012-11-27 21:26:52 -05:00
Karsten Loesing
2bf195d0ce
Add script to fix "A1" entries in geoip file.
...
Fixes #6266 .
2012-11-27 21:24:07 -05:00
Nick Mathewson
267c0e5aa1
Make sure that the error in ADDRMAP events is well-formed
...
"error=Unable to launch resolve request" is not a nice thing to tell
the controller. Bugfix on 0.2.0.19-alpha (c11c48fc
2012-11-23 11:36:44 -05:00
Nick Mathewson
864e15cd1c
In comments and logs, say "UTC" not "GMT"
...
Fix for #6113 .
Note that the RFC1123 times we generate still all say 'GMT'. I'm
going to suggest this is not worth changing.
2012-11-23 10:05:16 -05:00
Nick Mathewson
b1ad84dce6
Add a changes file for IPv6 exits
2012-11-14 23:35:55 -05:00
Nick Mathewson
7908ab2093
Move address map into its own file.
2012-11-14 23:16:20 -05:00
Andrea Shepard
2cb82c33bc
Merge branch 'bug7267' of ssh://git-rw.torproject.org/user/andrea/tor
2012-11-13 18:54:24 -08:00
Nick Mathewson
02a43e5eb6
Merge remote-tracking branch 'public/bug7059'
2012-11-13 21:50:07 -05:00
Nick Mathewson
b17aa28e46
Actually distribute the geoip6 file.
...
Fixes a bug (with no ticket) on 0.2.4.6-alpha.
2012-11-13 21:24:28 -05:00
Andrea Shepard
3b517ea5f4
Add changes file for bug 7267
2012-11-13 13:46:36 -08:00
Roger Dingledine
713b5eb31c
fold in changes files
2012-11-12 23:51:47 -05:00
Roger Dingledine
a90affa84b
Merge branch 'maint-0.2.3'
2012-11-12 23:49:37 -05:00
Roger Dingledine
88bb48e785
use a more logical operator
...
Fix a harmless bug when opting against publishing a relay descriptor
because DisableNetwork is set.
Fixes bug 7464; bugfix on 0.2.3.9-alpha.
2012-11-12 23:47:21 -05:00
Nick Mathewson
f473d83dea
Possible fix for bug 7212
...
This is the simplest possible workaround: make it safe to call
circuit_cell_queue_clear() on a non-attached circuit, and make it
safe-but-a-LD_BUG-warning to call update_circuit_on_cmux() on a
non-attached circuit.
LocalWords: unstage src Untracked
2012-11-12 08:28:09 -05:00
Andrea Shepard
0523c8de7d
Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org/user/andrea/tor
2012-11-10 03:24:41 -08:00
Andrea Shepard
fc1a9a13cf
Add changes file for connection_mark_for_close()/connection_mark_and_flush() or_connection_t checking
2012-11-10 02:38:40 -08:00
Nick Mathewson
713736a6a7
Fix a memory leak in handling errors on CERTS cells. bug 7422
2012-11-08 23:01:39 -05:00
Nick Mathewson
81deddb08c
Merge remote-tracking branch 'origin/maint-0.2.3'
...
Conflicts:
src/common/crypto.c
src/or/rendservice.c
2012-11-08 16:48:04 -05:00
Nick Mathewson
49dd5ef3a3
Add and use and unlikely-to-be-eliminated memwipe()
...
Apparently some compilers like to eliminate memset() operations on
data that's about to go out-of-scope. I've gone with the safest
possible replacement, which might be a bit slow. I don't think this
is critical path in any way that will affect performance, but if it
is, we can work on that in 0.2.4.
Fixes bug 7352.
2012-11-08 16:44:50 -05:00
Andrea Shepard
9f3f5372b8
Merge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/tor
2012-11-07 11:43:04 -08:00
Andrea Shepard
3b270e86be
Add changes file for bug7350
2012-11-07 11:39:49 -08:00
Nick Mathewson
cd054ceada
Merge branch 'bug7285'
2012-11-06 18:02:03 -05:00
George Kadianakis
a9f786758d
Add warning message when a managed proxy dies during configuration.
2012-11-06 17:53:09 -05:00
Nick Mathewson
11c467f643
Fix a stupid logic-error in warnings about low ports.
...
Instead of warning about low ports that are advertised, we should have
been warning about low ports that we're listening on. Bug 7285, fix
on 0.2.3.9-alpha.
2012-11-06 17:15:39 -05:00
Nick Mathewson
0e8be13b9f
Allow an optional $ in GETINFO ns/id/<identity>
...
That's not where I'd want to put a $, but apparently the other
foo/id/<identity> things allow it, as does an arguably valid
interpretation of control-spec.txt. So let's be consistent.
Fix for a piece of bug 7059.
2012-11-04 22:12:11 -05:00
Nick Mathewson
626a8b60d7
Merge remote-tracking branch 'linus/bug5053-bug5055'
...
Conflicts:
src/or/geoip.c
2012-11-04 21:44:31 -05:00
Nick Mathewson
4458fd0cd8
In the unit tests, use "test_eq_ptr" and "test_neq_ptr" consistently
...
This is part of what's needed to build without warnings on mingw64:
it was warning about the cast from void* to long that happened in
the places we were using test_{n,}eq on pointers.
The alternative here would have been to broaden tt_int_op to accept
a long long or an intptr_t, but that's less correct (since pointers
aren't integers), and would hurt the portability of tinytest a
little.
Fixes part of 7260.
2012-11-02 14:32:05 -04:00
Nick Mathewson
9dee6b1dce
Compile (with warnings) with mingw64
...
Patch from yayooo for bug 7260, forward-ported to 0.2.4.
2012-11-02 13:51:11 -04:00
Nick Mathewson
05194cce62
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.
2012-11-02 13:14:39 -04:00
Andrea Shepard
be37125030
Merge branch 'bsd_queue' of ssh://git-rw.torproject.org/nickm/tor
2012-10-30 14:39:14 -07:00
Nick Mathewson
03b32161bc
changes file for bug 7235
2012-10-28 10:58:26 -04:00
Nick Mathewson
b6e0236fa2
Fold in changelog item; draft blurb for 0.2.4.5-alpha
2012-10-25 10:32:20 -04:00
Nick Mathewson
48cdcc9d4a
Merge branch 'link_negotiation_assert_024'
2012-10-25 10:21:01 -04:00
Nick Mathewson
ad49b8ab56
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/*.
2012-10-25 10:13:34 -04:00
