]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
13 years agoChange smartlist_create->smartlist_new in bug4744 branch as merged to master
Nick Mathewson [Wed, 13 Jun 2012 16:16:02 +0000 (12:16 -0400)] 
Change smartlist_create->smartlist_new in bug4744 branch as merged to master

13 years agoMerge branch 'bug4744_squashed'
Nick Mathewson [Wed, 13 Jun 2012 16:09:13 +0000 (12:09 -0400)] 
Merge branch 'bug4744_squashed'

13 years agoImplement the client side of proposal 198
Nick Mathewson [Tue, 15 May 2012 19:32:18 +0000 (15:32 -0400)] 
Implement the client side of proposal 198

This is a feature removal: we no longer fake any ciphersuite other
than the not-really-standard SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA
(0xfeff).  This change will let servers rely on our actually
supporting what we claim to support, and thereby let Tor migrate to
better TLS ciphersuites.

As a drawback, Tor instances that use old openssl versions and
openssl builds with ciphers disabled will no longer give the
"firefox" cipher list.

13 years agoMerge remote-tracking branch 'public/bug3940_redux'
Nick Mathewson [Wed, 13 Jun 2012 15:40:38 +0000 (11:40 -0400)] 
Merge remote-tracking branch 'public/bug3940_redux'

13 years agoMerge remote-tracking branch 'public/bug5210'
Nick Mathewson [Wed, 13 Jun 2012 15:37:11 +0000 (11:37 -0400)] 
Merge remote-tracking branch 'public/bug5210'

13 years agoFix another clang compile warning
Sebastian Hahn [Wed, 13 Jun 2012 14:51:56 +0000 (16:51 +0200)] 
Fix another clang compile warning

We forgot this when we fixed 5969.

13 years agoMerge branch 'task-5849-3-squashed'
Nick Mathewson [Wed, 13 Jun 2012 14:13:01 +0000 (10:13 -0400)] 
Merge branch 'task-5849-3-squashed'

13 years agoFix integer overflow in cell stats spotted by atagar.
Karsten Loesing [Mon, 14 May 2012 12:30:04 +0000 (14:30 +0200)] 
Fix integer overflow in cell stats spotted by atagar.

Fixes #5849.

13 years agoMerge branch 'maint-0.2.2'
Roger Dingledine [Wed, 13 Jun 2012 07:48:43 +0000 (03:48 -0400)] 
Merge branch 'maint-0.2.2'

13 years agoUpdate to the June 2012 GeoIP database.
Karsten Loesing [Wed, 13 Jun 2012 07:21:00 +0000 (09:21 +0200)] 
Update to the June 2012 GeoIP database.

Manually removed range 0.116.0.0 to 0.119.255.255 which Maxmind says is
assigned to AT.  This is very likely a bug in their database, because
0.0.0.0/8 is a reserved range.

13 years agoforward-port the 0.2.2.37 changelog
Roger Dingledine [Tue, 12 Jun 2012 11:50:34 +0000 (07:50 -0400)] 
forward-port the 0.2.2.37 changelog

13 years agofold in changes files so far
Roger Dingledine [Tue, 12 Jun 2012 08:21:39 +0000 (04:21 -0400)] 
fold in changes files so far

13 years agofixup! An attempt at bug3940 and making AllowDotExit 0 work with MapAddress
Nick Mathewson [Tue, 12 Jun 2012 01:50:52 +0000 (21:50 -0400)] 
fixup! An attempt at bug3940 and making AllowDotExit 0 work with MapAddress

13 years agoDocument ADDRMAPSRC_NONE.
Nick Mathewson [Tue, 12 Jun 2012 01:49:08 +0000 (21:49 -0400)] 
Document ADDRMAPSRC_NONE.

13 years agoMerge branch 'bug5452'
Nick Mathewson [Mon, 11 Jun 2012 18:44:26 +0000 (14:44 -0400)] 
Merge branch 'bug5452'

13 years agoCall bug5452 fix a feature; note its trac number in the changes file
Nick Mathewson [Mon, 11 Jun 2012 18:44:08 +0000 (14:44 -0400)] 
Call bug5452 fix a feature; note its trac number in the changes file

13 years agoAdd change file for 5452
Andrea Shepard [Mon, 11 Jun 2012 18:17:59 +0000 (11:17 -0700)] 
Add change file for 5452

13 years agoMake RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT warning tell the user how to fix it.
Andrea Shepard [Mon, 11 Jun 2012 18:09:19 +0000 (11:09 -0700)] 
Make RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT warning tell the user how to fix it.

13 years agoDo not try to use -pie on windows; it appears to break badly and weirdly
Nick Mathewson [Mon, 11 Jun 2012 16:22:48 +0000 (12:22 -0400)] 
Do not try to use -pie on windows; it appears to break badly and weirdly

13 years agoRemove a couple of debugging "echo"s that snuck into configure.in
Nick Mathewson [Mon, 11 Jun 2012 15:30:43 +0000 (11:30 -0400)] 
Remove a couple of debugging "echo"s that snuck into configure.in

13 years agoMake our compiler-hardening checks robust against MinGW
Nick Mathewson [Mon, 11 Jun 2012 15:00:48 +0000 (11:00 -0400)] 
Make our compiler-hardening checks robust against MinGW

First, specify -Werror when we are testing each option; if it causes
a warning to appear, we shouldn't be adding it.

Second, do not attempt to add these options until after we have
found the libraries we want.  Previously, I would hit a bug where
the linker hardening options worked fine when we weren't linking
anything, but failed completely once we added openssl or libevent.

13 years agoMerge remote-tracking branch 'public/bug4592'
Nick Mathewson [Mon, 11 Jun 2012 14:34:48 +0000 (10:34 -0400)] 
Merge remote-tracking branch 'public/bug4592'

13 years agoMerge remote-tracking branch 'public/bug5598'
Nick Mathewson [Mon, 11 Jun 2012 14:26:48 +0000 (10:26 -0400)] 
Merge remote-tracking branch 'public/bug5598'

Conflicts:
doc/tor.1.txt

Conflict was on a formatting issue in the manpage.

13 years agoMerge branch 'bug6097'
Nick Mathewson [Mon, 11 Jun 2012 14:14:01 +0000 (10:14 -0400)] 
Merge branch 'bug6097'

13 years agoMerge branch 'bug2865'
Nick Mathewson [Mon, 11 Jun 2012 13:53:49 +0000 (09:53 -0400)] 
Merge branch 'bug2865'

13 years agoList defaults consistently in manpage
Nick Mathewson [Mon, 11 Jun 2012 13:48:46 +0000 (09:48 -0400)] 
List defaults consistently in manpage

Nearly everywhere, we end options with "(Default: foo)".  But in a
few places, we inserted an extra period after or before the close
parenthesis, and in a few other places we said "(Defaults to foo)".
Let's not do that.

13 years agoWarn if the user has set CircuitBuildTimeout stupidly low and turned off LearnCircuit...
Andrea Shepard [Sat, 9 Jun 2012 06:44:06 +0000 (23:44 -0700)] 
Warn if the user has set CircuitBuildTimeout stupidly low and turned off LearnCircuitBuildTimeout

13 years agochanges file and whitespace fix for bug5235 patch
Nick Mathewson [Fri, 8 Jun 2012 18:32:09 +0000 (14:32 -0400)] 
changes file and whitespace fix for bug5235 patch

13 years agoRate-limit 'Weighted bandwidth is 0.000000 ...' message; it can be produced in extrem...
Andrea Shepard [Fri, 8 Jun 2012 10:00:30 +0000 (03:00 -0700)] 
Rate-limit 'Weighted bandwidth is 0.000000 ...' message; it can be produced in extreme quantities

13 years agotypo noticed by "_raptor"
Roger Dingledine [Thu, 7 Jun 2012 19:35:19 +0000 (15:35 -0400)] 
typo noticed by "_raptor"

13 years agoCorrect the defaults for the *Statistics options
Nick Mathewson [Thu, 7 Jun 2012 17:46:51 +0000 (13:46 -0400)] 
Correct the defaults for the *Statistics options

13 years agoMerge remote-tracking branch 'arma/bug3886'
Nick Mathewson [Thu, 7 Jun 2012 17:30:55 +0000 (13:30 -0400)] 
Merge remote-tracking branch 'arma/bug3886'

Conflicts:
src/or/dirserv.c

13 years agoFix mingw build with -DUNICODE -D_UNICODE
Nick Mathewson [Thu, 7 Jun 2012 15:59:32 +0000 (11:59 -0400)] 
Fix mingw build with -DUNICODE -D_UNICODE

This is a very blunt fix, and mostly just turns some func() calls
into FuncA() to make things build again.  Fixes bug 6097.

13 years agoBe more careful calling wcstombs
Nick Mathewson [Thu, 17 May 2012 14:08:48 +0000 (10:08 -0400)] 
Be more careful calling wcstombs

The function is not guaranteed to NUL-terminate its output.  It
*is*, however, guaranteed not to generate more than two bytes per
multibyte character (plus terminating nul), so the general approach
I'm taking is to try to allocate enough space, AND to manually add a
NUL at the end of each buffer just in case I screwed up the "enough
space" thing.

Fixes bug 5909.

13 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Thu, 7 Jun 2012 13:46:14 +0000 (09:46 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

13 years agoapply 6abb638954b to 0.2.3.16-alpha too
Roger Dingledine [Thu, 7 Jun 2012 07:55:12 +0000 (03:55 -0400)] 
apply 6abb638954b to 0.2.3.16-alpha too

13 years agoSend a CRLF at the end of a STATUS_* event, not in the middle of it
Robert Ransom [Thu, 7 Jun 2012 03:22:06 +0000 (03:22 +0000)] 
Send a CRLF at the end of a STATUS_* event, not in the middle of it

Fixes bug 6094; bugfix on commit 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f.

13 years agoChange the default for DynamicDHGroups to 0
Nick Mathewson [Wed, 6 Jun 2012 16:00:04 +0000 (12:00 -0400)] 
Change the default for DynamicDHGroups to 0

This feature can make Tor relays less identifiable by their use of the
mod_ssl DH group, but at the cost of some usability (#4721) and bridge
tracing (#6087) regressions.

We should try to turn this on by default again if we find that the
mod_ssl group is uncommon and/or we move to a different DH group size
(see #6088).  Before we can do so, we need a fix for bugs #6087 and

Resolves ticket #5598 for now.

13 years agouse my time machine to fix a few more typos
Roger Dingledine [Wed, 6 Jun 2012 04:30:25 +0000 (00:30 -0400)] 
use my time machine to fix a few more typos

13 years agobump to 0.2.3.16-alpha-dev
Roger Dingledine [Tue, 5 Jun 2012 22:37:19 +0000 (18:37 -0400)] 
bump to 0.2.3.16-alpha-dev

13 years agouse my time machine to fix the changelog
Roger Dingledine [Tue, 5 Jun 2012 22:36:58 +0000 (18:36 -0400)] 
use my time machine to fix the changelog

13 years agoadd a blurb for 0.2.3.16-alpha tor-0.2.3.16-alpha
Roger Dingledine [Tue, 5 Jun 2012 22:28:52 +0000 (18:28 -0400)] 
add a blurb for 0.2.3.16-alpha

13 years agotoday is the day for 0.2.3.16-alpha
Roger Dingledine [Tue, 5 Jun 2012 16:14:57 +0000 (12:14 -0400)] 
today is the day for 0.2.3.16-alpha

13 years agostart folding in the changes files
Roger Dingledine [Tue, 5 Jun 2012 16:05:31 +0000 (12:05 -0400)] 
start folding in the changes files

13 years agoMerge branch 'bug5603'
Nick Mathewson [Tue, 5 Jun 2012 15:47:34 +0000 (11:47 -0400)] 
Merge branch 'bug5603'

13 years agoChanges file for bug 5603
Nick Mathewson [Tue, 5 Jun 2012 15:47:16 +0000 (11:47 -0400)] 
Changes file for bug 5603

13 years agoMinor changes to bug5603
Nick Mathewson [Tue, 5 Jun 2012 15:39:31 +0000 (11:39 -0400)] 
Minor changes to bug5603

  * Minor stylistic changes to comments and doxygen
  * Use strcmp_opt; it already exists.
  * Tighten bridge_has_digest implementation a little.

13 years agoMerge remote-tracking branch 'public/getfilesize_64'
Nick Mathewson [Tue, 5 Jun 2012 15:10:42 +0000 (11:10 -0400)] 
Merge remote-tracking branch 'public/getfilesize_64'

Conflicts:
src/common/compat.c

The getfilesize change conflicted with the removal of file_handle
from the windows tor_mmap_t.

13 years agoFix some mingw build warnings
Nick Mathewson [Tue, 5 Jun 2012 15:06:26 +0000 (11:06 -0400)] 
Fix some mingw build warnings

These include:
   - Having a weird in_addr that can't be initialized with {0}
   - Needing INVALID_HANDLE_VALUE instead of -1 for file handles.
   - Having a weird dependent definition for struct stat.
   - pid is signed, not unsigned.

13 years agoRevert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges"
Nick Mathewson [Tue, 5 Jun 2012 14:47:05 +0000 (10:47 -0400)] 
Revert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges"

This reverts commit 981e896dd2eaf69798bb503c271306ee779dd6d2.

Apparently Karsten still needs DirReqStatistics for bridges; see

13 years agoDowngrade tor_assert(0) to tor_fragile_assert() in windows stub create_unix_sockaddr
Nick Mathewson [Tue, 5 Jun 2012 14:36:34 +0000 (10:36 -0400)] 
Downgrade tor_assert(0) to tor_fragile_assert() in windows stub create_unix_sockaddr

13 years agoMerge remote-tracking branch 'public/bug3894'
Nick Mathewson [Tue, 5 Jun 2012 14:31:00 +0000 (10:31 -0400)] 
Merge remote-tracking branch 'public/bug3894'

13 years agoMerge remote-tracking branch 'public/format_doubles'
Nick Mathewson [Tue, 5 Jun 2012 14:30:50 +0000 (10:30 -0400)] 
Merge remote-tracking branch 'public/format_doubles'

Conflicts:
src/or/geoip.c

13 years agoDisable (Cell,DirReq,Entry,ExitPort)Statistics on bridges
Nick Mathewson [Tue, 5 Jun 2012 14:25:50 +0000 (10:25 -0400)] 
Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges

These stats are currently discarded, but we might as well
hard-disable them on bridges, to be clean.

Fix for bug 5824; bugfix on 0.2.1.17-rc.

Patch originally by Karsten Loesing.

13 years agoMerge remote-tracking branch 'public/bug4657'
Nick Mathewson [Tue, 5 Jun 2012 14:20:44 +0000 (10:20 -0400)] 
Merge remote-tracking branch 'public/bug4657'

Conflicts:
src/or/router.c

13 years agoMerge remote-tracking branch 'public/bug4710'
Nick Mathewson [Tue, 5 Jun 2012 14:16:28 +0000 (10:16 -0400)] 
Merge remote-tracking branch 'public/bug4710'

13 years agoFix "make check-spaces" issues
Nick Mathewson [Tue, 5 Jun 2012 04:49:18 +0000 (00:49 -0400)] 
Fix "make check-spaces" issues

13 years agoResolve about 24 DOCDOCs
Nick Mathewson [Tue, 5 Jun 2012 04:17:54 +0000 (00:17 -0400)] 
Resolve about 24 DOCDOCs

13 years agoMissing copyright/license statement for procmon.c
Nick Mathewson [Tue, 5 Jun 2012 01:02:13 +0000 (21:02 -0400)] 
Missing copyright/license statement for procmon.c

13 years agoUpdate copyright dates to 2012; add a few missing copyright statements
Nick Mathewson [Tue, 5 Jun 2012 00:58:17 +0000 (20:58 -0400)] 
Update copyright dates to 2012; add a few missing copyright statements

13 years agoAdd about 60 more DOCDOC comments to 0.2.3
Nick Mathewson [Mon, 4 Jun 2012 23:51:00 +0000 (19:51 -0400)] 
Add about 60 more DOCDOC comments to 0.2.3

Also, try to resolve some doxygen issues.  First, define a magic
"This is doxygen!" macro so that we take the correct branch in
various #if/#else/#endifs in order to get the right documentation.
Second, add in a few grouping @{ and @} entries in order to get some
variables and fields to get grouped together.

13 years agoUpdate the "redox" doxygen/DOCDOC postprocessing script
Nick Mathewson [Mon, 4 Jun 2012 23:56:44 +0000 (19:56 -0400)] 
Update the "redox" doxygen/DOCDOC postprocessing script

Somewhere along the line, doxygen and tor changed their behavior a
little. The script is still a dreadful kludge, but now at least it
sorta works again.

13 years agoResolve some markup complaints from doxygen
Nick Mathewson [Mon, 4 Jun 2012 23:56:16 +0000 (19:56 -0400)] 
Resolve some markup complaints from doxygen

13 years agoResolve all currently pending DOCDOC items in master
Nick Mathewson [Mon, 4 Jun 2012 22:50:13 +0000 (18:50 -0400)] 
Resolve all currently pending DOCDOC items in master

13 years agoDocument the new exit_source_out argument to addressmap_rewrite
Nick Mathewson [Mon, 4 Jun 2012 21:15:21 +0000 (17:15 -0400)] 
Document the new exit_source_out argument to addressmap_rewrite

13 years agoMerge origin/maint-0.2.2 for 6007_strict
Nick Mathewson [Mon, 4 Jun 2012 15:47:36 +0000 (11:47 -0400)] 
Merge origin/maint-0.2.2 for 6007_strict

This code shouldn't have any effect in 0.2.3, since we already accept
(and handle) data received while we are expecting a renegotiation.
(That's because the 0.2.3.x handshake _does_ have data there instead of
the renegotiation.)

I'm leaving it in anyway, since if it breaks anything, we'll want it
broken in master too so we can find out about it.  I added an XXX023
comment so that we can come back later and fix that.

13 years agoMerge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2
Nick Mathewson [Mon, 4 Jun 2012 15:40:52 +0000 (11:40 -0400)] 
Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2

13 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Mon, 4 Jun 2012 15:36:33 +0000 (11:36 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

13 years agoMerge remote-tracking branch 'public/bug6033' into maint-0.2.2
Nick Mathewson [Mon, 4 Jun 2012 15:33:27 +0000 (11:33 -0400)] 
Merge remote-tracking branch 'public/bug6033' into maint-0.2.2

13 years agoKill non-open OR connections with any data on their inbufs.
Nick Mathewson [Thu, 31 May 2012 15:19:35 +0000 (11:19 -0400)] 
Kill non-open OR connections with any data on their inbufs.

This fixes a DoS issue where a client could send so much data in 5
minutes that they exhausted the server's RAM.  Fix for bug 5934 and
6007.  Bugfix on 0.2.0.20-rc, which enabled the v2 handshake.

13 years agoFix build warning on Lenny about strtok_r unit test
Nick Mathewson [Mon, 4 Jun 2012 15:07:52 +0000 (11:07 -0400)] 
Fix build warning on Lenny about strtok_r unit test

This fixes a warning in efb8a09f, where Debain Lenny's GCC doesn't get
that
    for (i=0; i<3; ++i) {
      const char *p;
      switch(i) {
       case 0:
         p="X"; break;
       case 1:
         p="Y"; break;
       case 2:
         p="Z"; break;
      }
      printf("%s\n", p);
    }
will never try to print an uninitialezed value.

Found by buildbots.  Bug in no released versions of Tor.

13 years agoclarify that LongLivedPorts is for hidden services too
Roger Dingledine [Mon, 4 Jun 2012 01:07:34 +0000 (21:07 -0400)] 
clarify that LongLivedPorts is for hidden services too

13 years agoWork around a bug in OpenSSL 1.0.1's TLS 1.1 and TLS 1.2 support
Nick Mathewson [Sun, 3 Jun 2012 00:05:32 +0000 (20:05 -0400)] 
Work around a bug in OpenSSL 1.0.1's TLS 1.1 and TLS 1.2 support

It appears that when OpenSSL negotiates a 1.1 or 1.2 connection, and it
decides to renegotiate, the client will send a record with version "1.0"
rather than with the current TLS version.  This would cause the
connection to fail whenever both sides had OpenSSL 1.0.1, and the v2 Tor
handshake was in use.

As a workaround, disable TLS 1.1 and TLS 1.2.  When a later version of
OpenSSL is released, we can make this conditional on running a fixed
version of OpenSSL.

Alternatively, we could disable TLS 1.1 and TLS 1.2 only on the client
side.  But doing it this way for now means that we not only fix TLS with
patched clients; we also fix TLS when the server has this patch and the
client does not.  That could be important to keep the network running
well.

Fixes bug 6033.

13 years agoImprove conflict resolution when adding new bridges.
George Kadianakis [Sat, 2 Jun 2012 21:21:49 +0000 (00:21 +0300)] 
Improve conflict resolution when adding new bridges.

13 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Thu, 31 May 2012 21:00:37 +0000 (17:00 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

13 years agoadd changes file for bug 5283
Roger Dingledine [Wed, 16 May 2012 00:50:29 +0000 (20:50 -0400)] 
add changes file for bug 5283

I called it a bugfix on 0.2.0.10-alpha, since git commit e5885deab is
where we introduced anonymized begin_dir connections.

13 years agoMake all begindir or one-hop circuits internal
Nick Mathewson [Tue, 15 May 2012 13:41:45 +0000 (09:41 -0400)] 
Make all begindir or one-hop circuits internal

This solves bug 5283, where client traffic could get sent over the
same circuit as an anonymized connection to a directory, even if
that circuit used an exit node unsuitable for clients.  By marking
the directory connection as needs_internal, we ensure that the
(non-internal!) client-traffic connection won't be sent over the
same circuit.

13 years agoMerge remote-tracking branch 'public/bug5089'
Nick Mathewson [Thu, 31 May 2012 20:21:54 +0000 (16:21 -0400)] 
Merge remote-tracking branch 'public/bug5089'

Conflicts:
src/test/test_util.c

Merge the unit tests; I added some when I did this branch against
0.2.2, and then the test format changed and master added more tests.

13 years agoA few more get_parent_directory tests.
Nick Mathewson [Thu, 31 May 2012 19:12:45 +0000 (15:12 -0400)] 
A few more get_parent_directory tests.

13 years agoMerge remote-tracking branch 'public/bug5374'
Nick Mathewson [Thu, 31 May 2012 19:07:19 +0000 (15:07 -0400)] 
Merge remote-tracking branch 'public/bug5374'

13 years agoMerge remote-tracking branch 'linus/bug4873_ln'
Nick Mathewson [Thu, 31 May 2012 18:37:29 +0000 (14:37 -0400)] 
Merge remote-tracking branch 'linus/bug4873_ln'

13 years agoMerge remote-tracking branch 'public/bug5541_v2'
Nick Mathewson [Thu, 31 May 2012 16:40:30 +0000 (12:40 -0400)] 
Merge remote-tracking branch 'public/bug5541_v2'

13 years agoMerge remote-tracking branch 'public/close_file_mapping'
Nick Mathewson [Thu, 31 May 2012 16:38:11 +0000 (12:38 -0400)] 
Merge remote-tracking branch 'public/close_file_mapping'

Conflicts:
src/common/compat.h

Conflict was between replacement of MS_WINDOWS with _WIN32 in
master, and with removal of file_handle from tor_mmap_t struct in
close_file_mapping branch (for bug 5951 fix).

13 years agoreindent CreateFile arguments.
Nick Mathewson [Thu, 31 May 2012 16:36:54 +0000 (12:36 -0400)] 
reindent CreateFile arguments.

13 years agoMerge remote-tracking branch 'linus/bug5355_ln'
Nick Mathewson [Thu, 31 May 2012 16:33:16 +0000 (12:33 -0400)] 
Merge remote-tracking branch 'linus/bug5355_ln'

13 years agoMerge remote-tracking branch 'public/bug1938'
Nick Mathewson [Thu, 31 May 2012 16:24:02 +0000 (12:24 -0400)] 
Merge remote-tracking branch 'public/bug1938'

13 years agoMerge remote-tracking branch 'public/bug2954_more'
Nick Mathewson [Thu, 31 May 2012 16:22:02 +0000 (12:22 -0400)] 
Merge remote-tracking branch 'public/bug2954_more'

13 years agoRemove unexpected "unexpectedly".
Linus Nordberg [Thu, 31 May 2012 11:08:57 +0000 (13:08 +0200)] 
Remove unexpected "unexpectedly".

13 years agoRemove spurioius return in one out of four if-else clauses.
Linus Nordberg [Thu, 31 May 2012 11:05:24 +0000 (13:05 +0200)] 
Remove spurioius return in one out of four if-else clauses.

We do return right after the if-else.  This return (with its confusing
comments) comes from before 6b7c3b42 but doesn't make sense now.

13 years agoMerge remote-tracking branch 'public/bug3196'
Nick Mathewson [Thu, 31 May 2012 05:02:27 +0000 (01:02 -0400)] 
Merge remote-tracking branch 'public/bug3196'

13 years agoMerge remote-tracking branch 'origin/maint-0.2.2'
Nick Mathewson [Thu, 31 May 2012 04:07:52 +0000 (00:07 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2'

(For bug 5969 fix)

13 years agoFix more clang format-nonliteral warnings (bug 5969)
Nick Mathewson [Wed, 30 May 2012 23:57:02 +0000 (19:57 -0400)] 
Fix more clang format-nonliteral warnings (bug 5969)

13 years agoMerge branch 'bug5604'
Nick Mathewson [Wed, 30 May 2012 21:00:36 +0000 (17:00 -0400)] 
Merge branch 'bug5604'

13 years agoAdd a little documentation for the bug5604 fix
Nick Mathewson [Wed, 30 May 2012 20:53:31 +0000 (16:53 -0400)] 
Add a little documentation for the bug5604 fix

13 years agoMerge remote-tracking branch 'public/bug5954'
Nick Mathewson [Wed, 30 May 2012 20:38:20 +0000 (16:38 -0400)] 
Merge remote-tracking branch 'public/bug5954'

13 years agoMerge remote-tracking branch 'linus/bug4369'
Nick Mathewson [Wed, 30 May 2012 17:05:15 +0000 (13:05 -0400)] 
Merge remote-tracking branch 'linus/bug4369'

13 years agoAdd __attribute__(format)s for our varargs printf/scanf wrappers
Nick Mathewson [Wed, 30 May 2012 16:14:38 +0000 (12:14 -0400)] 
Add __attribute__(format)s for our varargs printf/scanf wrappers

It turns out that if you set the third argument of
__attribute__(format) to 0, GCC and Clang will check the format
argument without expecting to find variadic arguments.  This is the
correct behavior for vsnprintf, vasprintf, and vscanf.

I'm hoping this will fix bug 5969 (a clang warning) by telling clang that
the format argument to tor_vasprintf is indeed a format string.

13 years agoFix clang 3.1 compile warning in crypto.c
Sebastian Hahn [Sun, 27 May 2012 16:28:15 +0000 (18:28 +0200)] 
Fix clang 3.1 compile warning in crypto.c

(Tweaked by nickm)

13 years agoFix a typo in changes/bug5916
Nick Mathewson [Wed, 30 May 2012 15:18:49 +0000 (11:18 -0400)] 
Fix a typo in changes/bug5916

13 years agoMerge remote-tracking branch 'public/bug5916'
Nick Mathewson [Wed, 30 May 2012 15:14:41 +0000 (11:14 -0400)] 
Merge remote-tracking branch 'public/bug5916'