[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'boklm/bug13857-v2'

[gk at torproject.org]

commit 5401e06508eae0aaa8f6357303b006dd833ba8e5
Merge: bf363a7 ca6ca42
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jan 8 14:28:00 2015 +0000

    Merge remote-tracking branch 'boklm/bug13857-v2'

 gitian/Makefile                                    |   16 +-
 gitian/README.build                                |    8 +
 tools/update-responses/README.md                   |    8 +-
 .../check_update_responses_deployement             |    1 +
 tools/update-responses/htdocs/no-update.xml        |    2 -
 tools/update-responses/update_responses            |  196 ++++++++++++++++----
 6 files changed, 189 insertions(+), 42 deletions(-)