If we overwrite src/or/micro-revision.i in during build, clean it out in
the clean target.

* debian-merge: (68 commits)
  New upstream version
  final touchups
  bump to 0.2.2.18-alpha
  warn more about AllowSingleHopExits
  merge in more changelog entries
  Clean up my 1776 fix a bit
  Move controller event for socks warning into log_unsafe_socks_warning
  changes entry for nopublish removal in 5040c855
  Make the coducmentation for SingleHop stuff slightly more dire
  Rate-limit unsafe socks warning
  Avoid perma-blocking the controller on bug in shrink_freelist
  Add changes file for bug1125
  Add changes file for bug1125
  Disable logging to control port connections in buf_shrink_freelists.
  Move the original log_info call out of the core of buf_shrink_freelists.
  Disable logging to control port connections in buf_shrink_freelists.
  Move the original log_info call out of the core of buf_shrink_freelists.
  let unpublished bridges learn their ip address too
  Enforce multiplicity rules when parsing annotations.
  Fix a bug where seting allow_annotations==0 only ignores annotations, but does not block them
  ...

* commit 'tor-0.2.2.18-alpha': (67 commits)
  final touchups
  bump to 0.2.2.18-alpha
  warn more about AllowSingleHopExits
  merge in more changelog entries
  Clean up my 1776 fix a bit
  Move controller event for socks warning into log_unsafe_socks_warning
  changes entry for nopublish removal in 5040c855
  Make the coducmentation for SingleHop stuff slightly more dire
  Rate-limit unsafe socks warning
  Avoid perma-blocking the controller on bug in shrink_freelist
  Add changes file for bug1125
  Add changes file for bug1125
  Disable logging to control port connections in buf_shrink_freelists.
  Move the original log_info call out of the core of buf_shrink_freelists.
  Disable logging to control port connections in buf_shrink_freelists.
  Move the original log_info call out of the core of buf_shrink_freelists.
  let unpublished bridges learn their ip address too
  Enforce multiplicity rules when parsing annotations.
  Fix a bug where seting allow_annotations==0 only ignores annotations, but does not block them
  Bulletproof the routerlist manipulation functions to handle reinserting the same descriptor
  ...

Sebastian notes (and I think correctly) that one of our ||s should
have been an &&, which simplifies a boolean expression to decide
whether to replace bridges.  I'm also refactoring out the negation at
the start of the expression, to make it more readable.

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

Pick 5 seconds as the limit. 5 seconds is a compromise here between
making sure the user notices that the bad behaviour is (still) happening
and not spamming their log too much needlessly (the log message is
pretty long). We also keep warning every time if safesocks is
specified, because then the user presumably wants to hear about every
blocked instance.

(This is based on the original patch by Sebastian, then backported to
0.2.2 and with warnings split into their own function.)

In all likelihood, this bug would make Tor assert, but if it doesn't,
let's not have two bugs.

If buf_shrink_freelists calls log_warn for some reason, we don't want the log
call itself to throw buf_shrink_freelists further off the rails.

Sending a log message to a control port can cause Tor to allocate a buffer,
thereby changing the length of the freelist behind buf_shrink_freelists's back,
thereby causing an assertion to fail.

Fixes bug #1125.

If buf_shrink_freelists calls log_warn for some reason, we don't want the log
call itself to throw buf_shrink_freelists further off the rails.

Sending a log message to a control port can cause Tor to allocate a buffer,
thereby changing the length of the freelist behind buf_shrink_freelists's back,
thereby causing an assertion to fail.

Fixes bug #1125.

We would never actually enforce multiplicity rules when parsing
annotations, since the counts array never got entries added to it for
annotations in the token list that got added by earlier calls to
tokenize_string.

Found by piebeer.

In f87c6f10 we made it so that MinUptimeHidServDirectoryV2
defaults to 0 if TestingTorNetwork is set. Add a manpage entry and a
changes file.

Jesse Adelman noticed that we don't currently describe what
happens very well.

Breaking this out of the last commit because this might be more
controversial.

We had a spelling discrepancy between the manpage and the source code
for some option. Resolve these in favor of the manpage, because it
makes more sense (for example, HTTP should be capitalized).

The code that makes use of the RunTesting option is #if 0, so setting
this option has no effect. Mark the option as obsolete for now, so that
Tor doesn't list it as an available option erroneously.