Nick Mathewson
eea69b7020
Merge branch '024_msvc_more'
2013-01-17 15:54:51 -05:00
Nick Mathewson
cd80f6ee0f
Another msvc changes entry
2013-01-17 15:54:21 -05:00
Nick Mathewson
213bd7760f
For now, always use donna32 on msvc
2013-01-17 15:53:37 -05:00
Nick Mathewson
60a2aa8b00
Add ntor-related modules to the Makefiles.nmake
2013-01-17 15:53:36 -05:00
Nick Mathewson
1af89ce540
Fix an MSVC warning in onion.h prototypes
2013-01-17 14:42:37 -05:00
Nick Mathewson
ae58303d42
Even more code-removal for 6826
...
(Pull on a thread and the whole sweater unravels.)
2013-01-17 14:40:12 -05:00
Nick Mathewson
2386a98d46
Add a missing part of bug 7311's makefile.nmake tweaks
...
Fix by "ultramage".
This already has a changes entry.
2013-01-17 10:01:22 -05:00
Nick Mathewson
514d484597
Merge branch 'bug6826_squashed'
2013-01-17 09:23:07 -05:00
Nick Mathewson
b30d06255c
Drop detection logic for pre-1.3 busted libevents
...
This won't actually break them any worse than they were broken before:
it just removes a set of warnings that nobody was actually seeing, I
hope.
Closes 6826
2013-01-17 09:22:57 -05:00
Nick Mathewson
d094a76cc8
Merge remote-tracking branch 'public/bug6302'
2013-01-17 09:20:24 -05:00
Karsten Loesing
da1e44ee51
Remove dirreq-v2-* lines from extra-info descriptors.
...
Implements the rest of #5823 .
2013-01-17 10:46:34 +01:00
Jérémy Bobbio
aa01d0a183
Implement proposal 204: ignore subdomains in hidden service addresses
...
The implementation is pretty straightforward: parse_extended_hostname() is
modified to drop any leading components from an address like
'foo.aaaaaaaaaaaaaaaa.onion'.
2013-01-16 23:29:59 -05:00
Nick Mathewson
b998431a33
Merge branch '024_msvc_squashed'
...
Conflicts:
src/or/or.h
srcwin32/orconfig.h
2013-01-16 22:32:12 -05:00
Nick Mathewson
b7cf7bd9ae
Fix an instance of snprintf; don't use _snprintf directly
2013-01-16 22:29:39 -05:00
Nick Mathewson
65b90edbe4
Changes files for 024_msvc branch
2013-01-16 22:29:39 -05:00
Nick Mathewson
5e06c4ee32
When building with MSVC, call every enum bitfield unsigned
...
Fixes bug 7305.
2013-01-16 22:29:39 -05:00
Nick Mathewson
739e83ca69
Add HAVE_EVENT_BASE_LOOPEXIT to win32/orconfig.h
...
Fix for bug 7308
2013-01-16 22:29:39 -05:00
Nick Mathewson
3b2abd8a40
Add more test modules for nmake makefiles
2013-01-16 22:29:39 -05:00
Nick Mathewson
aa8f30a487
Try to build tinytest.obj from the right sources
2013-01-16 22:29:39 -05:00
Nick Mathewson
ca3bc8973b
use the /Fe flag with msvc
...
Fixes 7309
2013-01-16 22:29:39 -05:00
Nick Mathewson
9ddcd96149
Add missing targets to src/test/Makefile.nmake. Fix for 7316
2013-01-16 22:29:39 -05:00
Nick Mathewson
7008d43936
Add HAVE_EVENT2_DNS_H to MSVC orconfig.h
...
Fix for bug 7313
2013-01-16 22:29:39 -05:00
Nick Mathewson
0558efbd62
Fix a const warning under msvc
2013-01-16 22:29:38 -05:00
Nick Mathewson
ce2513abb8
Add clean target and test subdir to makefile.nmake
2013-01-16 22:29:38 -05:00
Nick Mathewson
fb497dfe9e
Add missing objects to Makefile.nmake
2013-01-16 22:29:38 -05:00
Nick Mathewson
b7dd716195
Add missing includes and libs to makefile.nmake
...
Fixes bugs 7312 and 7310.
2013-01-16 22:29:38 -05:00
Nick Mathewson
0102aaeb6b
Define SIZEOF_INTPTR_T when defining replacement intptr_t
...
Fixes bug 7669
2013-01-16 22:29:38 -05:00
Nick Mathewson
8b62a738b3
Merge branch 'bug5285_v2'
2013-01-16 17:02:46 -05:00
Nick Mathewson
ca18768fb2
Aftermath of isin->contains renaming
...
Fix wide lines and comments, and add a changes file
2013-01-16 16:57:32 -05:00
Nick Mathewson
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
Nick Mathewson
e4821fa14d
Remove two extrneous semicolons in dirserv.c
...
In 6fbdf635
we added a couple of statements like:
if (test) {
...
};
The extraneous semicolons there get flagged as worrisome empty
statements by the cparser library, so let's fix them.
Patch by Christian Grothoff; fixes bug 7115.
2013-01-16 16:49:39 -05:00
Nick Mathewson
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
Nick Mathewson
9bd811b337
Refactor: Use SOCK_ERRNO to avoid some #ifdef _WIN32s
...
Fixes ticket 6302
2013-01-16 15:30:20 -05:00
Nick Mathewson
65e6e68981
Merge branch 'bug7972'
2013-01-16 13:56:10 -05:00
Nick Mathewson
50f527a2c9
Actually link against nacl when we want to use it
...
Fixes more of bug 7972
2013-01-16 13:07:52 -05:00
Nick Mathewson
e53e6caac5
Adjust control_reason when adjusting reason (related to 7902)
2013-01-16 12:52:19 -05:00
Nick Mathewson
08de029a17
Removee dirrec-v*-sharestatistics
...
These were unused and sometimes inaccurate. Resolves 5823.
2013-01-16 12:43:00 -05:00
Nick Mathewson
d1b5ae903f
When we get an END cell before CONNECTED, don't report SOCKS success
...
Bug 7902; fix on 0.1.0.1-rc.
2013-01-16 12:09:49 -05:00
Nick Mathewson
7fc91dc274
changes file for 7896
2013-01-16 11:43:36 -05:00
Nick Mathewson
5ed8ac4e57
Merge remote-tracking branch 'asn/bug7896'
2013-01-16 11:41:37 -05:00
Nick Mathewson
b987081941
Check for nacl headers in nacl/ subdir
...
Fix for bug 7972
2013-01-16 10:29:11 -05:00
Nick Mathewson
f57722d23e
Add a new automake dropping ("test-driver") to .gitignore
2013-01-16 01:56:35 -05:00
Nick Mathewson
4da083db3b
Update the copyright date to 201.
2013-01-16 01:54:56 -05:00
Nick Mathewson
b5ce4f94c3
Forward-port fix for 7889
2013-01-15 16:33:53 -05:00
Nick Mathewson
938cb6a55e
Merge remote-tracking branch 'origin/maint-0.2.3'
2013-01-15 16:30:26 -05:00
Nick Mathewson
ae15b55173
Merge branch 'bug7889_023' into maint-0.2.3
2013-01-15 16:30:07 -05:00
Nick Mathewson
c134bb5a8d
Merge branch 'small_typo_fixes'
2013-01-15 16:01:38 -05:00
Nick Mathewson
0301a1df6c
Bump to 0.2.4.9-alpha-dev
2013-01-15 16:01:02 -05:00
Roger Dingledine
6e4a4002c5
Clean up odds and ends
2013-01-15 15:40:17 -05:00
Roger Dingledine
23dd7c9012
bump to 0.2.4.9-alpha
2013-01-15 11:57:34 -05:00