commit c5fea3d34360a78237fdd734d20b7e79f88faba3 Merge: 6f3b8d5 3107402 Author: Georg Koppen gk@torproject.org Date: Thu Nov 5 11:20:13 2015 +0000

Merge branch 'master' into hardened-builds

Bundle-Data/Docs/ChangeLog.txt | 3 ++- tools/continuous-builds/build-tbb.sh | 4 ++-- tools/continuous-builds/park-nightly.sh | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-)