* debian-premerge: (143 commits)
  Revert removal of debian directory
  fix up contrib/checkOptionDocs.pl to match current practice (asciidoc manpage, no "online docs").
  Fix up compilation on windows.
  bump to 0.2.2.15-alpha
  fold in even more changelog entries
  delay geoip stats even more for relays-turned-bridges
  explain the non-fix for bug 1776
  bug 1776 isn't fixed. save its changelog entry for next time.
  Edit the changelog to reflect the fact that we are backing off on ending NOROUTE for now
  Backport END_STREAM_REASON_NOROUTE for client use.
  Correctly report written bytes on linked connections.
  Count bytes we spend on answering directory requests.
  Remove unused function declarations
  Scale CONSENSUS_MIN_SECONDS_BEFORE_CACHING by voting interval
  fold in the next set of changelog entries
  Fix compilation with --with-dmalloc
  161b2750 didn't really retry the stream. this does.
  Make Sebastian's bug1831 branch build with --enable-gcc-warnings
  Make Sebastian's misc-reasons branch compile; frob the changes file
  Make unit tests work when tests get run in subprocesses.
  ...

This reverts commit de7ed2fd.

Conflicts:
	src/or/reasons.c

Sebastian Hahn authored 14 years ago and Nick Mathewson committed 14 years ago

(Partial backport of 150ed553, 161b2750, and 4c948ffd.)

Conflicts:
	src/or/rephist.h

Also remove some #if 0'd code from the unit tests for buffers. The
code was killed in e6794e58 (5 years
ago), and is now broken anyways.

Resolved conflict in
	src/or/networkstatus.c

If the voting interval was short enough, the two-minutes delay
of CONSENSUS_MIN_SECONDS_BEFORE_CACHING would confuse bridges
to the point where they would assert before downloading a consensus.
It it was even shorter (<4 minutes, I think), caches would
assert too.  This patch fixes that by having replacing the
two-minutes value with MIN(2 minutes, interval/16).

Bugfix for 1141; the cache bug could occur since 0.2.0.8-alpha, so
I'm calling this a bugfix on that.  Robert Hogan diagnosed this.
Done as a patch against maint-0.2.1, since it makes it hard to
run some kinds of testing networks.

Karsten Loesing authored 14 years ago and Nick Mathewson committed 14 years ago

Fixes 1832; bugfix on 0.2.2.6-alpha

Apparently the way we handled cleaning up temporary directories with
atexit() meant that when the child process exited, it would remove the
temporary directory, thus making other tests in the main process fail.

It happened in dirvote_add_signatures_to_pending_consesus().

Remove the msg parameter to pass an error message out. This
wasn't needed and made it harder to detect a memory leak.

Thanks weasel for noticing.