]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
11 years agosandbox: allow access to various stats/*-stats files
Michael Wolf [Wed, 21 May 2014 02:52:16 +0000 (22:52 -0400)] 
sandbox: allow access to various stats/*-stats files

Fix for 12064 part 1

11 years agoDocumentation fix: DataDir/status/* -> DataDir/stats/*
Nick Mathewson [Thu, 22 May 2014 23:45:45 +0000 (19:45 -0400)] 
Documentation fix: DataDir/status/* -> DataDir/stats/*

Our documentation had the name of this directory wrong.

11 years agoMerge remote-tracking branch 'andrea/bug11476'
Nick Mathewson [Thu, 22 May 2014 20:27:29 +0000 (16:27 -0400)] 
Merge remote-tracking branch 'andrea/bug11476'

11 years agoEliminate #ifdef ENABLE_MEMPOOLS in packed_cell_new/free()
Andrea Shepard [Wed, 21 May 2014 17:53:25 +0000 (10:53 -0700)] 
Eliminate #ifdef ENABLE_MEMPOOLS in packed_cell_new/free()

11 years agosandbox: permit gettid, sched_getaffinity
Nick Mathewson [Tue, 20 May 2014 19:49:01 +0000 (15:49 -0400)] 
sandbox: permit gettid, sched_getaffinity

These are needed under some circumstances if we are running with
expensive-hardening and sandbox at the same time.

fixes 11477, bugfix on 0.2.5.4-alpha (where we introduced
expensive-hardening)

11 years agofix a wide line
Nick Mathewson [Tue, 20 May 2014 19:22:27 +0000 (15:22 -0400)] 
fix a wide line

11 years agosandbox: support logfile rotation
Nick Mathewson [Tue, 20 May 2014 19:21:27 +0000 (15:21 -0400)] 
sandbox: support logfile rotation

Fixes bug 12032; bugfix on 0.2.5.1-alpha

11 years agodoc/HACKING: Improve documentation of how to bump version in maint
Nick Mathewson [Tue, 20 May 2014 19:02:35 +0000 (15:02 -0400)] 
doc/HACKING: Improve documentation of how to bump version in maint

See discussion on 9553: Some of the build scripts don't like it when
you can't merge maint into release.

11 years agosandbox: tolerate reloading with DirPortFrontPage set
Nick Mathewson [Tue, 20 May 2014 18:58:28 +0000 (14:58 -0400)] 
sandbox: tolerate reloading with DirPortFrontPage set

Also, don't tolerate changing DirPortFrontPage.

Fixes bug 12028; bugfix on 0.2.5.1-alpha.

11 years agosandbox: Disallow options which would make us call exec()
Nick Mathewson [Tue, 20 May 2014 16:21:31 +0000 (12:21 -0400)] 
sandbox: Disallow options which would make us call exec()

None of the things we might exec() can possibly run under the
sanbox, so rather than crash later, we have to refuse to accept the
configuration nice and early.

The longer-term solution is to have an exec() helper, but wow is
that risky.

fixes 12043; bugfix on 0.2.5.1-alpha

11 years agosandbox: Permit access to stats/dirreq-stats
Nick Mathewson [Tue, 20 May 2014 16:06:08 +0000 (12:06 -0400)] 
sandbox: Permit access to stats/dirreq-stats

This prevents a crash when rotating logs with dirreq-stats enabled

fixes 12035; bugfix on 0.2.5.1-alpha.

11 years agoOops; permit rename with the correct filename
Nick Mathewson [Tue, 20 May 2014 16:03:27 +0000 (12:03 -0400)] 
Oops; permit rename with the correct filename

11 years agoFix a sentence that I never
Nick Mathewson [Tue, 20 May 2014 15:58:18 +0000 (11:58 -0400)] 
Fix a sentence that I never

11 years agoSandbox: allow access to stats/bridge-stats
Nick Mathewson [Tue, 20 May 2014 15:57:03 +0000 (11:57 -0400)] 
Sandbox: allow access to stats/bridge-stats

Fix for 12041; bugfix on 0.2.5.1-alpha.

11 years agonote a comment that nickm didn't finish
Roger Dingledine [Sat, 17 May 2014 04:02:41 +0000 (00:02 -0400)] 
note a comment that nickm didn't finish

11 years agoAdd changes file for bug11476
Andrea Shepard [Fri, 16 May 2014 15:56:42 +0000 (08:56 -0700)] 
Add changes file for bug11476

11 years agoTurn --enable-mempools off by default
Andrea Shepard [Fri, 16 May 2014 15:51:51 +0000 (08:51 -0700)] 
Turn --enable-mempools off by default

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Fri, 16 May 2014 13:17:34 +0000 (09:17 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

This is an "ours" merge, to avoid taking the commit that bumped
maint-0.2.4's version to 0.2.4.22-dev.

11 years agoBump maint-0.2.4 version to 0.2.4.22-dev
Nick Mathewson [Fri, 16 May 2014 13:16:54 +0000 (09:16 -0400)] 
Bump maint-0.2.4 version to 0.2.4.22-dev

(See discussion on #9553)

11 years agoDocument that we're incrementing version numbers in maint.
Nick Mathewson [Fri, 16 May 2014 13:13:38 +0000 (09:13 -0400)] 
Document that we're incrementing version numbers in maint.

(ticket 9553)

11 years agoForward-port 0.2.4.22 changelog
Nick Mathewson [Fri, 16 May 2014 13:06:48 +0000 (09:06 -0400)] 
Forward-port 0.2.4.22 changelog

11 years agoMerge remote-tracking branch 'public/bug11469_024'
Nick Mathewson [Thu, 15 May 2014 17:35:08 +0000 (13:35 -0400)] 
Merge remote-tracking branch 'public/bug11469_024'

11 years agowhitespace fix, more
Nick Mathewson [Thu, 15 May 2014 02:55:02 +0000 (22:55 -0400)] 
whitespace fix, more

11 years agoMerge branch 'bug11946'
Nick Mathewson [Thu, 15 May 2014 02:51:51 +0000 (22:51 -0400)] 
Merge branch 'bug11946'

11 years agowhitespace fix
Nick Mathewson [Thu, 15 May 2014 02:50:25 +0000 (22:50 -0400)] 
whitespace fix

11 years agoImproved comments on bug11946 fix
Nick Mathewson [Thu, 15 May 2014 02:49:38 +0000 (22:49 -0400)] 
Improved comments on bug11946 fix

11 years agoUse DirPort for uploading descriptors.
Nick Mathewson [Thu, 15 May 2014 01:49:57 +0000 (21:49 -0400)] 
Use DirPort for uploading descriptors.

When we converted the horrible set of options that previously
controlled "use ORPort or DirPort? Anonymously or Non-anonymouly?" to
a single 'indirection' argument, we missed
directory_post_to_dirservers.

The problematic code was introduced in 5cbeb6080, which went into
0.2.4.3-alpha.  This is a fix for bug 11469.

11 years agoUse tor_getpw{nam,uid} wrappers to fix bug 11946
Nick Mathewson [Wed, 14 May 2014 17:53:14 +0000 (13:53 -0400)] 
Use tor_getpw{nam,uid} wrappers to fix bug 11946

When running with User set, we frequently try to look up our
information in the user database (e.g., /etc/passwd).  The seccomp2
sandbox setup doesn't let us open /etc/passwd, and probably
shouldn't.

To fix this, we have a pair of wrappers for getpwnam and getpwuid.
When a real call to getpwnam or getpwuid fails, they fall back to a
cached value, if the uid/gid matches.

(Granting access to /etc/passwd isn't possible with the way we
handle opening files through the sandbox.  It's not desirable either.)

11 years agoAdd a pair of wrapper functions: tor_getpwnam() and tor_getpwuid()
Nick Mathewson [Wed, 14 May 2014 17:50:43 +0000 (13:50 -0400)] 
Add a pair of wrapper functions: tor_getpwnam() and tor_getpwuid()

We'll use these to deal with being unable to access the user DB
after we install the sandbox, to fix bug 11946.

11 years agomake the changelog text wrapper respect arma's no-initial-openparen rule
Nick Mathewson [Wed, 14 May 2014 16:56:09 +0000 (12:56 -0400)] 
make the changelog text wrapper respect arma's no-initial-openparen rule

11 years agoAdd --disable-mempools configure option
Andrea Shepard [Tue, 13 May 2014 01:23:34 +0000 (18:23 -0700)] 
Add --disable-mempools configure option

11 years agoTurn --enable-buf-freelists off by default
Andrea Shepard [Tue, 13 May 2014 00:28:26 +0000 (17:28 -0700)] 
Turn --enable-buf-freelists off by default

11 years agoMerge branch 'bug9781_v2'
Nick Mathewson [Mon, 12 May 2014 17:35:22 +0000 (13:35 -0400)] 
Merge branch 'bug9781_v2'

11 years agoLog an error reply from tor-fw-helper correctly.
Nick Mathewson [Wed, 7 May 2014 01:34:40 +0000 (21:34 -0400)] 
Log an error reply from tor-fw-helper correctly.

Fix for bug 9781; bugfix on cd05f35d2cdf50 in 0.2.4.2-alpha.

11 years agochanges file for gisle vanem's MSVC fix
Nick Mathewson [Mon, 12 May 2014 15:49:17 +0000 (11:49 -0400)] 
changes file for gisle vanem's MSVC fix

11 years agoFix compilation of test_status.c with MSVC
Gisle Vanem [Mon, 12 May 2014 04:34:06 +0000 (00:34 -0400)] 
Fix compilation of test_status.c with MSVC

11 years agofix whitespace
Nick Mathewson [Mon, 12 May 2014 03:40:48 +0000 (23:40 -0400)] 
fix whitespace

11 years agoQuench clang's complaints with -Wshorten-64-to-32 when time_t is not long.
dana koch [Sun, 11 May 2014 23:16:06 +0000 (09:16 +1000)] 
Quench clang's complaints with -Wshorten-64-to-32 when time_t is not long.

On OpenBSD 5.4, time_t is a 32-bit integer. These instances contain
implicit treatment of long and time_t as comparable types, so explicitly
cast to time_t.

11 years agoOne more 64->32
Nick Mathewson [Thu, 8 May 2014 18:10:30 +0000 (14:10 -0400)] 
One more 64->32

11 years agoFix numerous 64->32 errors in the unit tests
Nick Mathewson [Thu, 8 May 2014 18:01:17 +0000 (14:01 -0400)] 
Fix numerous 64->32 errors in the unit tests

Before the 11825 fix, these were all silently ignored.

11 years agoFix unearthed problems in unit tests
Nick Mathewson [Thu, 8 May 2014 17:16:08 +0000 (13:16 -0400)] 
Fix unearthed problems in unit tests

11 years agoFix numerous type errors in the unit tests
Nick Mathewson [Thu, 8 May 2014 17:08:13 +0000 (13:08 -0400)] 
Fix numerous type errors in the unit tests

Remove tinytest casts that were suppressing them.

Fix for #11825.

11 years agoFix test_util_max_mem on 32-bit CPUs
Nick Mathewson [Thu, 8 May 2014 16:48:41 +0000 (12:48 -0400)] 
Fix test_util_max_mem on 32-bit CPUs

11 years agoMore unit tests for #11648-related stuff
Nick Mathewson [Thu, 8 May 2014 16:41:01 +0000 (12:41 -0400)] 
More unit tests for #11648-related stuff

These are actually tests for #311.  It appears to me that we didn't
fix #311 properly when we thought we did in 475eb5d6; instead, the
real fix was 05eff35ac6d64b, a few minutes earlier.

11 years agoMove structures into (private) part of buffers.h so we can inspect them while testing
Nick Mathewson [Thu, 8 May 2014 16:40:40 +0000 (12:40 -0400)] 
Move structures into (private) part of buffers.h so we can inspect them while testing

11 years agoMerge remote-tracking branch 'public/bug11648'
Nick Mathewson [Thu, 8 May 2014 16:01:23 +0000 (12:01 -0400)] 
Merge remote-tracking branch 'public/bug11648'

11 years agochanges file for 11648
Nick Mathewson [Thu, 8 May 2014 16:01:12 +0000 (12:01 -0400)] 
changes file for 11648

11 years agoReturn success when get_total_system_memory() succeeds.
Nick Mathewson [Thu, 8 May 2014 04:32:22 +0000 (00:32 -0400)] 
Return success when get_total_system_memory() succeeds.

Fixes bug 11805; bugfix on 0.2.5.4-alpha.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 8 May 2014 03:12:51 +0000 (23:12 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4
Nick Mathewson [Thu, 8 May 2014 03:11:32 +0000 (23:11 -0400)] 
Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 8 May 2014 03:07:03 +0000 (23:07 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

11 years agoMerge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4
Nick Mathewson [Thu, 8 May 2014 03:04:59 +0000 (23:04 -0400)] 
Merge remote-tracking branch 'public/ticket11528_024' into maint-0.2.4

11 years agoMerge remote-tracking branch 'public/bug11513_024' into maint-0.2.4
Nick Mathewson [Thu, 8 May 2014 03:04:48 +0000 (23:04 -0400)] 
Merge remote-tracking branch 'public/bug11513_024' into maint-0.2.4

11 years agoMerge remote-tracking branch 'public/update_ciphers_ff28' into maint-0.2.4
Nick Mathewson [Thu, 8 May 2014 03:04:22 +0000 (23:04 -0400)] 
Merge remote-tracking branch 'public/update_ciphers_ff28' into maint-0.2.4

11 years agoMerge remote-tracking branch 'public/bug11737_diagnostic'
Nick Mathewson [Thu, 8 May 2014 02:52:44 +0000 (22:52 -0400)] 
Merge remote-tracking branch 'public/bug11737_diagnostic'

11 years agoImprove bug11743 message a bit.
Nick Mathewson [Thu, 8 May 2014 02:23:19 +0000 (22:23 -0400)] 
Improve bug11743 message a bit.

11 years agoMerge remote-tracking branch 'public/bug8387_diagnostic'
Nick Mathewson [Thu, 8 May 2014 02:15:24 +0000 (22:15 -0400)] 
Merge remote-tracking branch 'public/bug8387_diagnostic'

11 years agoBetter log message for 8387 diagnostic
Nick Mathewson [Thu, 8 May 2014 02:13:29 +0000 (22:13 -0400)] 
Better log message for 8387 diagnostic

11 years agoAlways finalize a zlib stream of server descriptors.
Nick Mathewson [Wed, 7 May 2014 14:23:08 +0000 (10:23 -0400)] 
Always finalize a zlib stream of server descriptors.

Possible fix for bug 11648.

11 years agoScript to detect unused autoconf outputs
Nick Mathewson [Wed, 7 May 2014 07:56:51 +0000 (03:56 -0400)] 
Script to detect unused autoconf outputs

Should help speed up mingw builds by a percent or two.

11 years agoFix test_pick_circid on 32-bit platforms
Nick Mathewson [Wed, 7 May 2014 07:27:49 +0000 (03:27 -0400)] 
Fix test_pick_circid on 32-bit platforms

11 years agoBasic tests for get_unique_circ_id_by_chan.
Nick Mathewson [Wed, 7 May 2014 06:57:50 +0000 (02:57 -0400)] 
Basic tests for get_unique_circ_id_by_chan.

11 years agoQuick-and-dirty test for packed_cell_is_destroy
Nick Mathewson [Wed, 7 May 2014 06:05:35 +0000 (02:05 -0400)] 
Quick-and-dirty test for packed_cell_is_destroy

11 years agoMove code-generation scripts to scripts/codegen
Nick Mathewson [Wed, 7 May 2014 05:17:41 +0000 (01:17 -0400)] 
Move code-generation scripts to scripts/codegen

Now that we have a scripts/* directory, let's put the scripts we use
for generating C there.

11 years agoREADME file for the scripts directory
Nick Mathewson [Wed, 7 May 2014 05:10:28 +0000 (01:10 -0400)] 
README file for the scripts directory

11 years agoAdd a README file for the contrib directory
Nick Mathewson [Wed, 7 May 2014 05:03:35 +0000 (01:03 -0400)] 
Add a README file for the contrib directory

11 years agoMention siphash in src/ext/README
Nick Mathewson [Wed, 7 May 2014 05:03:14 +0000 (01:03 -0400)] 
Mention siphash in src/ext/README

11 years agoSplit portfw-error-logging code into a new function.
Nick Mathewson [Wed, 7 May 2014 01:22:40 +0000 (21:22 -0400)] 
Split portfw-error-logging code into a new function.

No code has changed; only moved. Part of a fix for 9781.

11 years agoRemove a spurious variable.
Nick Mathewson [Wed, 7 May 2014 00:46:26 +0000 (20:46 -0400)] 
Remove a spurious variable.

11 years agoMerge remote-tracking branch 'public/bug11750'
Nick Mathewson [Wed, 7 May 2014 00:44:41 +0000 (20:44 -0400)] 
Merge remote-tracking branch 'public/bug11750'

11 years agoMerge branch 'bug11743_option_b'
Nick Mathewson [Wed, 7 May 2014 00:40:40 +0000 (20:40 -0400)] 
Merge branch 'bug11743_option_b'

11 years agoUnit test for dirvote_create_microdescriptor
Nick Mathewson [Wed, 7 May 2014 00:36:19 +0000 (20:36 -0400)] 
Unit test for dirvote_create_microdescriptor

11 years agoUnit test for write_to_buf_zlib
Nick Mathewson [Tue, 6 May 2014 23:29:56 +0000 (19:29 -0400)] 
Unit test for write_to_buf_zlib

11 years agoFuture-proof "id" lines against proposal 220.
Nick Mathewson [Tue, 6 May 2014 21:10:59 +0000 (17:10 -0400)] 
Future-proof "id" lines against proposal 220.

11 years agofix a copy-paste comment mistake
Nick Mathewson [Tue, 6 May 2014 21:09:16 +0000 (17:09 -0400)] 
fix a copy-paste comment mistake

11 years agochanges file for bug11743
Nick Mathewson [Tue, 6 May 2014 20:28:34 +0000 (16:28 -0400)] 
changes file for bug11743

11 years agoMerge remote-tracking branch 'karsten/bug11742'
Nick Mathewson [Tue, 6 May 2014 17:54:37 +0000 (13:54 -0400)] 
Merge remote-tracking branch 'karsten/bug11742'

11 years agoCheck HT_REP_IS_BAD_() when giving a bug-7164 warning.
Nick Mathewson [Tue, 6 May 2014 17:03:24 +0000 (13:03 -0400)] 
Check HT_REP_IS_BAD_() when giving a bug-7164 warning.

This may let us know if we're hitting 7164 because of an
hte_hash-corruption situation proposed by "cypherpunks" in bug
11737.

11 years agoAdd a siphash benchmark.
Nick Mathewson [Tue, 6 May 2014 16:55:39 +0000 (12:55 -0400)] 
Add a siphash benchmark.

11 years agoFaster chan_circid_entry_hash implementation
Nick Mathewson [Tue, 6 May 2014 16:27:18 +0000 (12:27 -0400)] 
Faster chan_circid_entry_hash implementation

Since this is critical-path, let's tune the value we pass to
csiphash a little so it fits into one whole round.

11 years agoFix compilation with DEBUG_DNS_CACHE
Nick Mathewson [Tue, 6 May 2014 14:18:34 +0000 (10:18 -0400)] 
Fix compilation with DEBUG_DNS_CACHE

Reported by cypherpunks.

Fix for #11761; bugfix on 0.2.3.13-alpha where we made ht.h stop using
_identifiers.

11 years agoUse siphash on channel/circuit-id map too
Nick Mathewson [Mon, 5 May 2014 16:13:33 +0000 (12:13 -0400)] 
Use siphash on channel/circuit-id map too

Fixes ticket 11750.

11 years agoFix cross-compiling when 128-bit math compiles but won't link
Nick Mathewson [Mon, 5 May 2014 15:44:02 +0000 (11:44 -0400)] 
Fix cross-compiling when 128-bit math compiles but won't link

Apparently, there exist cross-compiling environments for arm7 where
you can compile a 64x64->128 multiply, but not link it.

Fixes bug 11729; bugfix on 0.2.4.8-alpha. Patch from 'conradev'.

11 years agoConsensus method 18: Add a base64 ID digest to the microdesc
Nick Mathewson [Mon, 5 May 2014 15:28:25 +0000 (11:28 -0400)] 
Consensus method 18: Add a base64 ID digest to the microdesc

This is a stopgap measure to make sure that microdescriptors never
collide; see bug 11743.

11 years agoDon't start sandbox except for CMD_RUN_TOR
Nick Mathewson [Mon, 5 May 2014 14:29:35 +0000 (10:29 -0400)] 
Don't start sandbox except for CMD_RUN_TOR

This was crashing on --verify-config in the debian startup script, if you
had sandboxing enabled.  Fixes 11609; fix on 0.2.5.1-alpha.

11 years agoRemove /tor/dbg-stability.txt URL.
Karsten Loesing [Mon, 5 May 2014 09:21:35 +0000 (11:21 +0200)] 
Remove /tor/dbg-stability.txt URL.

The /tor/dbg-stability.txt URL was meant to help debug WFU and MTBF
calculations, but nobody was using it.

Fixes #11742.

11 years agoTweak the changelog formatter a little.
Nick Mathewson [Fri, 2 May 2014 16:50:23 +0000 (12:50 -0400)] 
Tweak the changelog formatter a little.

(I had a bad clone of Knuth's algorithm sitting around in an old code
repository of mine.  I added orphan detection and smarter hyphenation;
it seems to give marginally better results than we had before.)

11 years agoFix test_config_write_to_data_subdir
Nick Mathewson [Thu, 1 May 2014 17:27:20 +0000 (13:27 -0400)] 
Fix test_config_write_to_data_subdir

Bugfix on aa0eb2022342798fc78b2bde89d393f37c59fe78; bugfix not on any
released Tor.

11 years agohave only one code path for #9635 logging
Nick Mathewson [Thu, 1 May 2014 16:40:33 +0000 (12:40 -0400)] 
have only one code path for #9635 logging

11 years agoMerge remote-tracking branch 'public/bug9635'
Nick Mathewson [Thu, 1 May 2014 16:39:39 +0000 (12:39 -0400)] 
Merge remote-tracking branch 'public/bug9635'

11 years agoMerge remote-tracking branch 'public/bug11233_diagnose'
Nick Mathewson [Thu, 1 May 2014 16:37:16 +0000 (12:37 -0400)] 
Merge remote-tracking branch 'public/bug11233_diagnose'

11 years agoMerge branch 'bug11654_squashed'
Nick Mathewson [Thu, 1 May 2014 16:34:59 +0000 (12:34 -0400)] 
Merge branch 'bug11654_squashed'

11 years agoFix a misuse of strlcpy() introduced by the #11156 patch.
George Kadianakis [Thu, 1 May 2014 13:44:29 +0000 (14:44 +0100)] 
Fix a misuse of strlcpy() introduced by the #11156 patch.

11 years agowhitespace fix
Nick Mathewson [Thu, 1 May 2014 16:31:38 +0000 (12:31 -0400)] 
whitespace fix

11 years agoMerge remote-tracking branch 'public/valgrind_tests'
Nick Mathewson [Thu, 1 May 2014 16:29:31 +0000 (12:29 -0400)] 
Merge remote-tracking branch 'public/valgrind_tests'

11 years agoMerge remote-tracking branch 'public/bug4345a_024'
Nick Mathewson [Thu, 1 May 2014 16:13:07 +0000 (12:13 -0400)] 
Merge remote-tracking branch 'public/bug4345a_024'

11 years agoMerge remote-tracking branch 'public/bug10849_025'
Nick Mathewson [Thu, 1 May 2014 15:51:22 +0000 (11:51 -0400)] 
Merge remote-tracking branch 'public/bug10849_025'

Conflicts:
src/or/config.c

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4'
Nick Mathewson [Thu, 1 May 2014 15:45:38 +0000 (11:45 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4'

(this is an "ours" merge, to avoid taking 6a4f5d9b4d into 0.2.5: that
commit downgrades the bug 7164 warning in versions <= 0.2.4 because it
isn't as useful as the one 0.2.5 has)

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Thu, 1 May 2014 15:44:25 +0000 (11:44 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
src/or/microdesc.c

11 years agoDowngrade bug 7164 warning to INFO
Nick Mathewson [Thu, 1 May 2014 15:42:02 +0000 (11:42 -0400)] 
Downgrade bug 7164 warning to INFO

The 0.2.5.x warning is the one that might help us track this down; the
warnings in stable are just annoying users over and over and over.