commit 68493debd487ef18563db5351b78b3cde3a9f88a Merge: 652e344 0be3b04 Author: Erinn Clark <erinn@torproject.org> Date: Tue Aug 30 23:13:34 2011 +0100 Merge branches 'diginotar' and 'maint-2.2' into maint-2.2 .../0004-Remove-DigiNotar-root.patch | 1842 ++++++++++++++++++++ src/current-patches/0005-Smash-the-state.patch | 31 + 2 files changed, 1873 insertions(+), 0 deletions(-)