b998431a33
Merge branch '024_msvc_squashed'
...
Conflicts:
src/or/or.h
srcwin32/orconfig.h
2013-01-16 22:32:12 -05:00
b7cf7bd9ae
Fix an instance of snprintf; don't use _snprintf directly
2013-01-16 22:29:39 -05:00
5e06c4ee32
When building with MSVC, call every enum bitfield unsigned
...
Fixes bug 7305.
2013-01-16 22:29:39 -05:00
739e83ca69
Add HAVE_EVENT_BASE_LOOPEXIT to win32/orconfig.h
...
Fix for bug 7308
2013-01-16 22:29:39 -05:00
3b2abd8a40
Add more test modules for nmake makefiles
2013-01-16 22:29:39 -05:00
aa8f30a487
Try to build tinytest.obj from the right sources
2013-01-16 22:29:39 -05:00
ca3bc8973b
use the /Fe flag with msvc
...
Fixes 7309
2013-01-16 22:29:39 -05:00
9ddcd96149
Add missing targets to src/test/Makefile.nmake. Fix for 7316
2013-01-16 22:29:39 -05:00
7008d43936
Add HAVE_EVENT2_DNS_H to MSVC orconfig.h
...
Fix for bug 7313
2013-01-16 22:29:39 -05:00
0558efbd62
Fix a const warning under msvc
2013-01-16 22:29:38 -05:00
ce2513abb8
Add clean target and test subdir to makefile.nmake
2013-01-16 22:29:38 -05:00
fb497dfe9e
Add missing objects to Makefile.nmake
2013-01-16 22:29:38 -05:00
b7dd716195
Add missing includes and libs to makefile.nmake
...
Fixes bugs 7312 and 7310.
2013-01-16 22:29:38 -05:00
0102aaeb6b
Define SIZEOF_INTPTR_T when defining replacement intptr_t
...
Fixes bug 7669
2013-01-16 22:29:38 -05:00
ca18768fb2
Aftermath of isin->contains renaming
...
Fix wide lines and comments, and add a changes file
2013-01-16 16:57:32 -05:00
49e619c1cf
Rename *_isin to *_contains
...
This is an automatically generated commit, from the following perl script,
run with the options "-w -i -p".
s/smartlist_string_num_isin/smartlist_contains_int_as_string/g;
s/smartlist_string_isin((?:_case)?)/smartlist_contains_string$1/g;
s/smartlist_digest_isin/smartlist_contains_digest/g;
s/smartlist_isin/smartlist_contains/g;
s/digestset_isin/digestset_contains/g;
2013-01-16 16:57:11 -05:00
e4821fa14d
Remove two extrneous semicolons in dirserv.c
...
In 6fbdf635
2013-01-16 16:49:39 -05:00
2645de704b
Definx HAVE_EVENT_BASE_LOOPEXITin msvc orconfig.h
...
Fixes bug 7308; bugfix on no released Tor, since we haven't actually built
right on MSVC in ages.
2013-01-16 16:32:38 -05:00
65e6e68981
Merge branch 'bug7972'
2013-01-16 13:56:10 -05:00
50f527a2c9
Actually link against nacl when we want to use it
...
Fixes more of bug 7972
2013-01-16 13:07:52 -05:00
5ed8ac4e57
Merge remote-tracking branch 'asn/bug7896'
2013-01-16 11:41:37 -05:00
b987081941
Check for nacl headers in nacl/ subdir
...
Fix for bug 7972
2013-01-16 10:29:11 -05:00
4da083db3b
Update the copyright date to 201.
2013-01-16 01:54:56 -05:00
b5ce4f94c3
Forward-port fix for 7889
2013-01-15 16:33:53 -05:00
938cb6a55e
Merge remote-tracking branch 'origin/maint-0.2.3'
2013-01-15 16:30:26 -05:00
ae15b55173
Merge branch 'bug7889_023' into maint-0.2.3
2013-01-15 16:30:07 -05:00
c134bb5a8d
Merge branch 'small_typo_fixes'
2013-01-15 16:01:38 -05:00
0301a1df6c
Bump to 0.2.4.9-alpha-dev
2013-01-15 16:01:02 -05:00
6e4a4002c5
Clean up odds and ends
2013-01-15 15:40:17 -05:00
23dd7c9012
bump to 0.2.4.9-alpha
2013-01-15 11:57:34 -05:00
beca92c31b
Fix handling of ntor handshakes received via CREATE cells
...
Fixes bug 7959; bugfix on 0.2.4.8-alpha.
2013-01-15 00:41:09 -05:00
ebf30613ea
Better log message to diagnose #7959
2013-01-15 00:25:07 -05:00
85eb83052f
Bump version to 0.2.4.8-alpha-dev
2013-01-15 00:24:19 -05:00
26cffd3b86
bump to 0.2.4.8-alpha
2013-01-14 18:52:42 -05:00
47122d1d25
Revert junk accidentally included with "start folding in the changes entries"
...
Looks like Roger's debugging code wanted to take a tour of the world
outside his sandbox.
This reverts part of commit 19d3720236
2013-01-14 14:41:59 -05:00
cb24852ec5
Merge remote-tracking branch 'origin/maint-0.2.3'
2013-01-14 14:24:53 -05:00
1625cddf3a
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-01-14 14:24:19 -05:00
4ccf09b1c2
Reject create/begin/etc cells with {circ,stream}ID 0.
...
Otherwise, it's possible to create streams or circuits with these
bogus IDs, leading to orphaned circuits or streams, or to ones that
can cause bandwidth DOS problems.
Fixes bug 7889; bugfix on all released Tors.
2013-01-14 14:02:13 -05:00
19d3720236
start folding in the changes entries
2013-01-14 13:34:59 -05:00
c9242f4fd4
Merge branch 'bug7869'
2013-01-14 12:32:00 -05:00
d357b97b6d
Merge remote-tracking branch 'mikeperry/bug7691-rebased'
2013-01-13 21:48:33 -05:00
a5ee3834bf
Handle EWOULDBLOCK as EAGAIN if they happen to be different.
...
Fixes bug 7935. Reported by 'oftc_must_be_destroyed'.
2013-01-11 16:36:54 -08:00
50028e4d68
Mention name of the transport used when we learn the fpr of a bridge.
2013-01-09 15:52:35 +02:00
d05ff310a5
Bug 7691 review fixes.
...
Also add in the random nonce generation.
2013-01-08 19:29:56 -08:00
f60c25cd25
Bug 7341 code review fixes.
2013-01-08 18:12:38 -08:00
15fdfc2993
Bug 7691: Send a probe cell down certain types of circs.
...
In general, if we tried to use a circ for a stream, but then decided to place
that stream on a different circuit, we need to probe the original circuit
before deciding it was a "success".
We also need to do the same for cannibalized circuits that go unused.
2013-01-08 17:28:08 -08:00
3458d904f6
Fix bug 7341.
...
Fix cannibalize, rend circ and intro circ timeout handling.
2013-01-08 17:21:05 -08:00
31d888c834
Make the = at the end of ntor-onion-key optional.
...
Makes bug 7869 more easily fixable if we ever choose to do so.
2013-01-05 22:53:32 -05:00
32114d70ae
Update to the January 2013 GeoIP database.
2013-01-05 08:18:26 +01:00
dffc8e359b
Whoops; make that unit test actually pass :/
2013-01-03 12:46:55 -05:00
Nick Mathewson
Roger Dingledine
George Kadianakis
Mike Perry
Karsten Loesing