From 06b3b401eaae329c3b80a06c9984f8b86809f708 Mon Sep 17 00:00:00 2001
From: Robert Raposa <rraposa@edx.org>
Date: Tue, 15 Nov 2016 10:11:31 -0500
Subject: [PATCH 1/2] Upgrade cryptography library.

---
 requirements/edx/base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 1fb2ec1bad..0e5cf4c884 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -10,7 +10,7 @@ bleach==1.4
 html5lib==0.999
 boto==2.39.0
 celery==3.1.18
-cryptography==1.3.1
+cryptography==1.5.3
 cssselect==0.9.1
 dealer==2.0.4
 defusedxml==0.4.1

From b796ba190098a25878a4957482276f7fd007c236 Mon Sep 17 00:00:00 2001
From: "J. Cliff Dyer" <cdyer@edx.org>
Date: Thu, 17 Nov 2016 12:11:25 -0500
Subject: [PATCH 2/2] Add missing migrations

---
 .../migrations/0004_auto_20161117_1209.py     | 19 +++++++++++++++++++
 .../migrations/0008_auto_20161117_1209.py     | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 common/djangoapps/django_comment_common/migrations/0004_auto_20161117_1209.py
 create mode 100644 common/djangoapps/student/migrations/0008_auto_20161117_1209.py

diff --git a/common/djangoapps/django_comment_common/migrations/0004_auto_20161117_1209.py b/common/djangoapps/django_comment_common/migrations/0004_auto_20161117_1209.py
new file mode 100644
index 0000000000..fe49d518ed
--- /dev/null
+++ b/common/djangoapps/django_comment_common/migrations/0004_auto_20161117_1209.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_comment_common', '0003_enable_forums'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='forumsconfig',
+            name='connection_timeout',
+            field=models.FloatField(default=5.0, help_text=b'Seconds to wait when trying to connect to the comment service.'),
+        ),
+    ]
diff --git a/common/djangoapps/student/migrations/0008_auto_20161117_1209.py b/common/djangoapps/student/migrations/0008_auto_20161117_1209.py
new file mode 100644
index 0000000000..6dee71b711
--- /dev/null
+++ b/common/djangoapps/student/migrations/0008_auto_20161117_1209.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('student', '0007_registrationcookieconfiguration'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='level_of_education',
+            field=models.CharField(blank=True, max_length=6, null=True, db_index=True, choices=[(b'p', b'Doctorate'), (b'm', b"Master's or professional degree"), (b'b', b"Bachelor's degree"), (b'a', b'Associate degree'), (b'hs', b'Secondary/high school'), (b'jhs', b'Junior secondary/junior high/middle school'), (b'el', b'Elementary/primary school'), (b'none', b'No formal education'), (b'other', b'Other education')]),
+        ),
+    ]