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

[zwol at torproject.org]

commit 092842af7faace09e0b6325f7ae40b112367c8e6
Merge: 5513c95 00d4889
Author: Zack Weinberg <zackw at panix.com>
Date:   Wed Apr 4 18:01:44 2012 -0700

    Merge branch 'master' of https://git.safdef.isc.org/git/stegotorus

 src/steg/http.cc     |    6 +++++-
 src/steg/payloads.cc |    4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)