aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix some remaining nmake/msvc build issuesNick Mathewson2012-05-16
|
* Merge branch 'win32_winnt'Nick Mathewson2012-05-16
|\
| * Bump _WIN32_WINNT to 0x0501 throughout the codeNick Mathewson2012-05-14
| | | | | | | | | | | | | | | | | | This tells the windows headers to give us definitions that didn't exist before XP -- like the ones that we need for IPv6 support. See bug #5861. We didn't run into this issue with mingw, since mingw doesn't respect _WIN32_WINNT as well as it should for some of its definitions.
| * Remove all instances of WIN32_WINNT (without leading _)Nick Mathewson2012-05-14
| | | | | | | | | | We started adding it in 59e2c77824840f back in 2004, 8 years and 3 days ago. It's time to deprogram ourselves from this cargo cult.
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-05-15
|\ \
| * | Clarify MaxCircuitDirtiness behavior with hidden services. Bug 5259.Nick Mathewson2012-05-15
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-05-15
|\| |
| * | Merge branch 'bug5796_022_squashed' into maint-0.2.2Nick Mathewson2012-05-15
| |\ \
| | * | Fix a crash bug on SETCIRCUITPURPOSE.Nick Mathewson2012-05-15
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-05-15
|\| | |
| * | | Merge remote-tracking branch 'karsten/geoip-may2012' into maint-0.2.2Nick Mathewson2012-05-15
| |\ \ \
| | * | | Update to the May 2012 GeoIP database.Karsten Loesing2012-05-07
| | |/ /
* | | | Merge remote-tracking branch 'linus/task-5891'Nick Mathewson2012-05-15
|\ \ \ \ | |_|_|/ |/| | |
| * | | Clarify changes file regarding which bugs get fixed.Linus Nordberg2012-05-15
| | | |
| * | | Rename changes file.Linus Nordberg2012-05-15
| | | |
| * | | Assert that rep_hist_format_desc_stats() returns !NULL.Linus Nordberg2012-05-15
| | | | | | | | | | | | | | | | | | | | The guard against this is the test for start_of_served_descs_stats_interval != 0 done earlier.
| * | | Fix desc stats on bridge authorities that didn't serve anything.Karsten Loesing2012-05-15
| | | |
* | | | Add a changes file for the misc bug5859 build issuesNick Mathewson2012-05-14
| | | |
* | | | MSVC build issue: it can't tell that tor_assert(0) aborts.Nick Mathewson2012-05-14
| | | |
* | | | MSVC build issue: make 'const' in declaration match 'const' in definitionNick Mathewson2012-05-14
| | | | | | | | | | | | | | | | | | | | | | | | MSVC warns if you declare a function as having a "int foo" argument and then implement it with a "const int foo" argument, even though the latter "const" is not a part of the function's interface.
* | | | MSVC build issue: we use INLINE as the one that will magically workNick Mathewson2012-05-14
| | | |
* | | | MSVC build issue: add magic to make openssl headers in aes.c workNick Mathewson2012-05-14
| | | |
* | | | Be a good git person: store nmakefiles in correct text fmtNick Mathewson2012-05-14
| | | |
* | | | Remove the unused torrc.bridge.in. Bug 5622.Nick Mathewson2012-05-14
| | | |
* | | | Add some MSVC stuff to gitignoreNick Mathewson2012-05-14
| | | |
* | | | We do not need to define _WIN32 by hand; MSVC does that for usNick Mathewson2012-05-14
| | | | | | | | | | | | | | | | Bug 5858; fix on 0.2.3.12-alpha
* | | | Fix win32 compilation of 31eb73f88e8Nick Mathewson2012-05-14
| | | |
* | | | Do not publish the "git-XXX" tag in server descriptorsNick Mathewson2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, allow packagers to put a 'TOR_BUILD_TAG' field in the server descriptor to indicate a platform-specific value, if they need to. (According to weasel, this was his use for the git- tag previously.) This is part of 2988
* | | | Cut down on the OS information we give.Nick Mathewson2012-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For uname-based detection, we now give only the OS name (e.g., "Darwin", "Linux".) For Windows, we give only the Operating System name as inferred from dw(Major|Minor)version, (e.g., "Windows XP", "Windows 7"), and whether the VER_NT_SERVER flag is set. For ticket 2988.
* | | | Fix a couple of wide linesNick Mathewson2012-05-11
| | | |
* | | | Merge remote-tracking branch 'asn/bug4865_take2'Nick Mathewson2012-05-11
|\ \ \ \
| * | | | Fix issues found by nickm.George Kadianakis2012-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Document fmt_addr_impl() and friends. * Parenthesize macro arguments. * Rename get_first_listener_addrport_for_pt() to get_first_listener_addrport_string(). * Handle port_cfg_t with no_listen. * Handle failure of router_get_active_listener_port_by_type(). * Add an XXX to router_get_active_listener_port_by_type().
| * | | | Add changes file for #4865.George Kadianakis2012-03-31
| | | | |
| * | | | Pass OR address to PT proxy, even with IPv6 or ORListenAddress.George Kadianakis2012-03-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce get_first_listener_addrport_for_pt() which returns a string containing the addrport of the first listener we could find. Use it to form the TOR_PT_ORPORT managed proxy protocol line.
| * | | | Introduce and use router_get_active_listener_port_by_type().George Kadianakis2012-03-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | router_get_active_listener_port_by_type() iterates all connections, trying to find a listener of a specific type, and returns its TCP port.
| * | | | Generalize fmt_addr() to support IPv6 decorations.George Kadianakis2012-03-31
| | | | |
* | | | | Merge remote-tracking branch 'public/bug5091'Nick Mathewson2012-05-11
|\ \ \ \ \
| * | | | | Fix tor_strtok_r_impl and test cases per bug #5091nils2012-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | == Nick here. I tweaked this patch a little to make it apply cleanly to master, to extract some common code into a function, and to replace snprintf with tor_snprintf. -- nickm
* | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2012-05-10
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | fix over-wide line from f661747370Roger Dingledine2012-05-10
| | | | | |
* | | | | | Fix O(n^2) performance when parsing a big pile of extrainfosNick Mathewson2012-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing an O(n) strlen in router_get_extrainfo_hash() for every one we tried to parse. Instead, have router_get_extrainfo_hash() take the length of the extrainfo as an argument, so that when it's called from extrainfo_parse_from_string(), it doesn't do a strlen() over the whole pile of extrainfos.
* | | | | | Merge remote-tracking branch 'public/bug4591'Nick Mathewson2012-05-10
|\ \ \ \ \ \
| * | | | | | Only disable cert chaining on the first TLS handshakeNick Mathewson2012-04-27
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the client uses a v2 cipherlist on the renegotiation handshake, it looks as if they could fail to get a good cert chain from the server, since they server would re-disable certificate chaining. This patch makes it so the code that make the server side of the first v2 handshake special can get called only once. Fix for 4591; bugfix on 0.2.0.20-rc.
* | | | | | Merge branch 'bug5786'Nick Mathewson2012-05-10
|\ \ \ \ \ \
| * | | | | | Detect out-of-bounds bwweightscale values early in the voting processNick Mathewson2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the authorities agreed on a sufficiently bad bwweightscale value (<=0 or == INT32_MAX), the bandwidth algorithm could make the voters assert while computing the consensus. Fix for bug5786; bugfix on 0.2.2.17-alpha
| * | | | | | Check more thoroughly for dups when parsing networkstatus parametersNick Mathewson2012-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See changes file for details. Partial fix for bug 5786; fix on 0.2.2.2-alpha.
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-05-10
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/util.c src/test/test_util.c
| * | | | | | Merge branch 'bug5786_range_022' into maint-0.2.2Nick Mathewson2012-05-10
| |\ \ \ \ \ \
| | * | | | | | Handle out-of-range values in tor_parse_* integer functionsNick Mathewson2012-05-07
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The underlying strtoX functions handle overflow by saturating and setting errno to ERANGE. If the min/max arguments to the tor_parse_* functions are equal to the minimum/maximum of the underlying type, then with the old approach, we wouldn't treat a too-large value as genuinely broken. Found this while looking at bug 5786; bugfix on 19da1f36 (in Tor 0.0.9), which introduced these functions.
* | | | | | | Merge remote-tracking branch 'asn/bug5540'Nick Mathewson2012-05-10
|\ \ \ \ \ \ \