* debian-merge:
  New upstream version
  0.2.2.8-alpha is coming out today sometime
  Fix a memory corruption bug while collecting bridge stats
  Rearrange _thread_test_func to please Coverity Scan
  Try to untangle the logic in server_port_flush
  Don't unlock a new log until done logging the tor version.
  Be quieter about failing to decode authority digests
  Since dump_microdescriptor() can return -1; make its type ssize_t
  Handle errors reported by fwrite() in dump_microdescriptor()
  Add --enable-static-(openssl|libevent) options
  New configure option: --enable-gcc-warnings-advisory
  Fix two rare leaks spotted by rieo.
  Avoid a possible crash in tls_log_errors.
  make the 0.2.2.7-alpha changelog actually complete.
  Don't use OutboundBindAddress to connect to localhost

* commit 'tor-0.2.2.8-alpha':
  0.2.2.8-alpha is coming out today sometime
  Fix a memory corruption bug while collecting bridge stats
  Rearrange _thread_test_func to please Coverity Scan
  Try to untangle the logic in server_port_flush
  Don't unlock a new log until done logging the tor version.
  Be quieter about failing to decode authority digests
  Since dump_microdescriptor() can return -1; make its type ssize_t
  Handle errors reported by fwrite() in dump_microdescriptor()
  Add --enable-static-(openssl|libevent) options
  New configure option: --enable-gcc-warnings-advisory
  Fix two rare leaks spotted by rieo.
  Avoid a possible crash in tls_log_errors.
  make the 0.2.2.7-alpha changelog actually complete.
  Don't use OutboundBindAddress to connect to localhost

Karsten Loesing authored 15 years ago and Sebastian Hahn committed 15 years ago

We accidentally freed the internal buffer for bridge stats when we
were writing the bridge stats file or honoring a control port
request for said data. Change the interfaces for
geoip_get_bridge_stats* to prevent these problems, and remove the
offending free/add a tor_strdup.

Fixes bug 1208.

I believe  that since  we were allocating  *cp while holding  a mutex,
coverity deduced that  *cp must be protected by  that mutex, and later
flipped out  when we didn't  use it  that way. If  this is so,  we can
solve our problems by moving the *cp = tor_strdup(buf) part outside of
the mutex-protected code.

It's a bit confusing to have a loop where another function,
confusingly named "*_free", is responsible for advancing the loop
variable (or rather, for altering a structure so that the next time
the loop variable's initializer is evaluated it evaluates to something
different.)

Not only has this confused people: it's also confused coverity scan.
Let's fix that.

This might please coverity scan.

This was freaking out some relay operators without good reason, as
it is nothing the relay operator can do anything about anyways.

Quieting this warning suggested by rieo.

Peter Palfrader authored 15 years ago and Nick Mathewson committed 15 years ago

Does not deal with error handling in dump_microdescriptor's callers.

Resolved conflicts in:
	configure.in
	src/or/Makefile.am
	src/tools/Makefile.am

These options only work when using --with-(openssl|libevent)-dir to
explicitly pick a libevent or openssl location.

Peter Palfrader authored 15 years ago and Nick Mathewson committed 15 years ago

the new configure option --enable-gcc-warnings-advisory enables
all the gcc flags that --enable-gcc-warnings does with the
exception of -Werror.

localhost does not resolve (or not to 127.0.0.1).  This should no longer
be necessary as our build chroots have gotten a lot better.

We were checking for msg==NULL, but not lib or proc.  This case can
only occur if we have an error whose string we somehow haven't loaded,
but it's worth coding defensively here.

Spotted by rieo on IRC.

weasel makes a good point.

* debian-merge: (95 commits)
  New upstream version
  bump to 0.2.2.7-alpha
  note the two new fixes are in 0.2.2.7-alpha too
  spread guard rotation out throughout the month
  weight guard choice by bandwidth; discard old guards
  add changelog entries for my commits from last week
  clean 0.2.2.7-alpha changelog; add 0.2.2.6 blurb
  bump to 0.2.1.22, and give it a changelog
  downgrade a warning
  rotate keys for moria1 and gabelmoo
  Fix build on Solaris by disabling support for DisableAllSwap
  Build Bug: -lm should come after passing ../common/libor.a to linker
  Log a notice when we get a new control connection
  stop bridge authorities from leaking their bridge list
  whitespace fixes
  fix an impossible-to-actually-trigger overflow in descriptor generation
  resolve path weighting edge case; fixes bug 1203
  trivial cleanups
  fix some typos in our spec files
  man page entries for PerConnBW{Rate,Burst}
  ...

* commit 'tor-0.2.2.7-alpha': (94 commits)
  bump to 0.2.2.7-alpha
  note the two new fixes are in 0.2.2.7-alpha too
  spread guard rotation out throughout the month
  weight guard choice by bandwidth; discard old guards
  add changelog entries for my commits from last week
  clean 0.2.2.7-alpha changelog; add 0.2.2.6 blurb
  bump to 0.2.1.22, and give it a changelog
  downgrade a warning
  rotate keys for moria1 and gabelmoo
  Fix build on Solaris by disabling support for DisableAllSwap
  Build Bug: -lm should come after passing ../common/libor.a to linker
  Log a notice when we get a new control connection
  stop bridge authorities from leaking their bridge list
  whitespace fixes
  fix an impossible-to-actually-trigger overflow in descriptor generation
  resolve path weighting edge case; fixes bug 1203
  trivial cleanups
  fix some typos in our spec files
  man page entries for PerConnBW{Rate,Burst}
  remove redundant validate_addr_policies() checks
  ...

The OutboundBindAddress option is useful for making sure that all of
your outbond connections use a given interface.  But when connecting
to 127.0.0.1 (or ::1 even) it's important to actually have the
connection come _from_ localhost, since lots of programs running on
localhost use the source address to authenticate that the connection
is really coming from the same host.

Our old code always bound to OutboundBindAddress, whether connecting
to localhost or not.  This would potentially break DNS servers on
localhost, and socks proxies on localhost.  This patch changes the
behavior so that we only look at OutboundBindAddress when connecting
to a non-loopback address.

Conflicts:

	ChangeLog

also reorder the stable changelog entries so they're in temporal order

Conflicts:

	ChangeLog
	configure.in
	contrib/tor-mingw.nsi.in
	src/win32/orconfig.h

this case can now legitimately happen, if you have a cached v2 status
from moria1, and you run with the new list of dirservers that's missing
the old moria1. it's nothing to worry about; the file will die off in
a month or two.

Fixes bug 1198. Solaris doesn't have RLIMIT_MEMLOCK for get/setrlimit,
so disable support because we don't know if all memory can be locked.

mfwitten authored 15 years ago and Nick Mathewson committed 15 years ago

The following commit:

    commit e56747f9
    Author: Nick Mathewson <nickm@torproject.org>
    Date:   Tue Dec 15 14:32:55 2009 -0500

        Refactor a bit so that it is safe to include math.h, and mostly not needed.

introduced this line:

    tor_resolve_LDADD = -lm ../common/libor.a @TOR_LIB_WS32@

which caused the build to fail, because only ../common/libor.a
(via the embedded ../common/util.o via ../common/util.c)
referenced libm's `lround' and `log' symbols, so that the
linker (GNU ld) didn't bother to import those symbols before
reading ../common/libor.a, thus leaving those symbols undefined.

The solution was to swap the order, producing the line:

    tor_resolve_LDADD = ../common/libor.a -lm @TOR_LIB_WS32@

Signed-off-by: Michael Witten <mfwitten@gmail.com>