Nick Mathewson 2e607ff519 Merge remote-tracking branch 'origin/maint-0.2.5' %!s(int64=9) %!d(string=hai) anos
..
tor-fw-helper e83eddd113 Add missing -Isrc/ext to tor-fw-helper/include.am %!s(int64=10) %!d(string=hai) anos
Makefile.nmake 2386a98d46 Add a missing part of bug 7311's makefile.nmake tweaks %!s(int64=11) %!d(string=hai) anos
include.am 50f527a2c9 Actually link against nacl when we want to use it %!s(int64=11) %!d(string=hai) anos
tor-checkkey.c a3e0a87d95 Completely refactor how FILENAME_PRIVATE works %!s(int64=11) %!d(string=hai) anos
tor-gencert.c 446e481c90 Check for duplicate arguments to tor-gencert %!s(int64=9) %!d(string=hai) anos
tor-resolve.c 09951bea7f Don't use the getaddrinfo sandbox cache from tor-resolve %!s(int64=9) %!d(string=hai) anos