[tor-commits] [stegotorus/master] Merge branch 'master' of https://git.safdef.isc.org/git/stegotorus

commit 560b952671f90505ca7193371410c370c9769f62 Merge: 343d961 0538c5a Author: Zack Weinberg <zackw@cmu.edu> Date: Mon Apr 23 15:41:50 2012 -0700 Merge branch 'master' of https://git.safdef.isc.org/git/stegotorus Conflicts: src/steg/zpack.h