Merge remote-tracking branch 'public/bug9635_warnings_025'

Conflicts:
	src/test/test.c
This commit is contained in:
Nick Mathewson
2015-02-02 16:31:32 -05:00
15 changed files with 75 additions and 38 deletions
+3
View File
@@ -0,0 +1,3 @@
o Downgraded warnings:
- Don't warn when we've attempted to contact a relay using the wrong
ntor onion key. Closes ticket 9635.