Nick Mathewson b969ee9dad Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5

2014-08-29 16:45:10 -04:00

..

bug12948

Resume expanding abbreviations for command-line options

2014-08-28 08:33:43 -04:00

bug12996

Downgrade "Unexpected onionskin length after decryption" warning

2014-08-29 16:38:54 -04:00

bug12997

Improve "Tried to establish rendezvous on non-OR or non-edge circuit"

2014-08-29 16:05:58 -04:00