[tor-commits] [tor/master] Merge branch 'karsten_bug13192_026_03_teor'