Nick Mathewson 9a179ff751 Merge branch 'maint-0.2.7' 8 éve
..
common f3ed5ec0ca Fix a pair of dead assignments 8 éve
config 9c66afe772 Merge branch 'maint-0.2.6' into maint-0.2.7 8 éve
ext 7186e2a943 Merge remote-tracking branch 'public/feature17694_strongest_027' 8 éve
or 39b2f2d35e Merge branch 'maint-0.2.7' 8 éve
test 9a179ff751 Merge branch 'maint-0.2.7' 8 éve
tools 54565ca804 Remove -F from tor-resolve(1) usage message. 9 éve
trunnel 49ccb7e7b8 Mention trunnel in CodingStandards; describe how in trunnel/README 9 éve
win32 551dba3290 Bump master to 0.2.8.0-alpha-dev 9 éve
include.am 3b7d0ed08e Use trunnel for crypto_pwbox encoding/decoding. 10 éve