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