Nick Mathewson c6f2ae514e Merge branch 'maint-0.2.5' into maint-0.2.6 9 lat temu
..
common e6965f78b8 Merge branch 'maint-0.2.5' into maint-0.2.6 9 lat temu
config 54771bcaba Merge branch 'maint-0.2.5' into maint-0.2.6 9 lat temu
ext c113544a94 Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6 11 lat temu
or c6f2ae514e Merge branch 'maint-0.2.5' into maint-0.2.6 9 lat temu
test e0b7598833 Repair breakage in early-error case of microdesc parsing 11 lat temu
tools f75ca04520 Tweak tor-resolve docs and logs 11 lat temu
trunnel 9fd6fbec28 Regenerate pwbox.c with the latest trunnel 12 lat temu
win32 9d1801b4b9 Bump maint-0.2.6 to 0.2.6.10-dev 11 lat temu
include.am 3b7d0ed08e Use trunnel for crypto_pwbox encoding/decoding. 12 lat temu