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

[zwol at torproject.org]

commit f65fb5c199bc2793d8c615506835df6ec33a8c61
Merge: d65537f 6966489
Author: Zack Weinberg <zackw at panix.com>
Date:   Tue Feb 14 15:02:00 2012 -0800

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

 src/steg/b64cookies.cc |  233 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/steg/b64cookies.h  |   20 ++++
 src/steg/b64decode.cc  |   88 ++++++++++++++++++
 src/steg/b64decode.h   |   66 ++++++++++++++
 src/steg/b64encode.cc  |  139 ++++++++++++++++++++++++++++
 src/steg/b64encode.h   |   75 +++++++++++++++
 6 files changed, 621 insertions(+), 0 deletions(-)