aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use PyPy 2.3 on OS XAlex Gaynor2014-05-091-2/+2
* Merge pull request #1025 from reaperhulk/add-faq-windowsAlex Gaynor2014-05-081-0/+13
|\
| * improved languagePaul Kehrer2014-05-081-1/+1
| * add faq entry to describe the error if a windows user doesn't install opensslPaul Kehrer2014-05-081-0/+13
* | Merge pull request #1021 from dreid/conda-linuxAlex Gaynor2014-05-071-2/+10
|\ \
| * | Wrap.David Reid2014-05-071-1/+2
| * | Lowercase a.David Reid2014-05-071-1/+1
| * | Fix #1020 - Add conda instructions for linux.David Reid2014-05-071-2/+9
|/ /
* | Merge pull request #1019 from phibos/masterPaul Kehrer2014-05-061-1/+29
|\ \ | |/ |/|
| * Add missing type SSL_OP_LEGACY_SERVER_CONNECTPhiBo2014-05-071-0/+1
| * Fix to build without secure renegotiation supportPhiBo2014-05-071-5/+7
| * Conditional binding for secure renegotiationPhiBo2014-05-061-6/+11
| * style fixes and conditional binding for SSL_OP_ALLOW_UNSAFE_RENEGOTIATIONPaul Kehrer2014-05-061-4/+15
| * Add macro to get secure renegotiation supportPhiBo2014-05-041-0/+2
| * Add support for SSL_get_ciphers()PhiBo2014-05-041-0/+7
* | Merge pull request #1017 from Ayrx/fix-documentation-typoPaul Kehrer2014-05-061-1/+1
|\ \
| * | Fixed misspellingAyrx2014-05-061-1/+1
|/ /
* | Merge pull request #1014 from public/098kPaul Kehrer2014-05-041-0/+1
|\ \ | |/ |/|
| * We also test on Ubuntu Lucid 0.9.8kAlex Stapleton2014-05-041-0/+1
* | Merge pull request #1011 from Ayrx/add-release-itemAlex Stapleton2014-05-041-0/+3
|\ \
| * | Added item to post-release tasksAyrx2014-05-041-0/+3
|/ /
* | Merge pull request #1010 from alex/deprecatedPaul Kehrer2014-05-032-20/+24
|\ \
| * | Whoopsie daysie.Alex Gaynor2014-05-031-2/+2
| * | Always use deprecated_callAlex Gaynor2014-05-031-4/+8
| * | Here tooAlex Gaynor2014-05-031-4/+4
| * | Switch tests to pass salt length to the right place, except where actually te...Alex Gaynor2014-05-031-12/+12
* | | Merge pull request #1009 from reaperhulk/fix-artifact-downloadAlex Gaynor2014-05-031-1/+1
|\ \ \ | |/ / |/| |
| * | Fix jenkins artifact download for release automationPaul Kehrer2014-05-031-1/+1
|/ /
* | Merge pull request #1008 from alex/style-fixPaul Kehrer2014-05-032-2/+2
|\ \ | |/ |/|
| * Style guide fix in the docsAlex Gaynor2014-05-032-2/+2
|/
* Merge pull request #1007 from alex/warning-stacklevelPaul Kehrer2014-05-031-2/+4
|\
| * Warn at the right stacklevelAlex Gaynor2014-05-031-2/+4
* | Merge pull request #1005 from reaperhulk/update-deprecationAlex Gaynor2014-05-031-1/+1
|\ \ | |/ |/|
| * update deprecation warnings from 0.4 release for 0.5Paul Kehrer2014-05-031-1/+1
* | Merge pull request #1004 from reaperhulk/reopen-masterAlex Gaynor2014-05-033-2/+7
|\ \ | |/ |/|
| * update versions and reopen masterPaul Kehrer2014-05-033-2/+7
* | Merge pull request #1003 from reaperhulk/bump-versionAlex Stapleton2014-05-033-6/+4
|\|
| * bump version to 0.4Paul Kehrer2014-05-033-6/+4
* | Merge pull request #1002 from public/doc-tweaks-4Alex Gaynor2014-05-024-10/+14
|\ \
| * | Fix some typos in the docsAlex Stapleton2014-05-024-10/+14
| |/
* | Merge pull request #1001 from alex/conda-docsDavid Reid2014-05-022-0/+19
|\ \ | |/ |/|
| * linkfiyAlex Gaynor2014-05-021-1/+2
| * typoAlex Gaynor2014-05-021-1/+1
| * More detailsAlex Gaynor2014-05-021-3/+10
| * Conda is a word I guessAlex Gaynor2014-05-021-0/+1
| * Fixed #1000 -- document the conda issue and workaroundAlex Gaynor2014-05-021-0/+10
|/
* Merge pull request #999 from alex/remove-out-of-date-commentPaul Kehrer2014-05-021-3/+0
|\
| * Removed out of date commentAlex Gaynor2014-05-021-3/+0
* | Merge pull request #998 from reaperhulk/dsa-multibackendAlex Gaynor2014-05-024-2/+70
|\ \ | |/ |/|
| * cover some missing lines in dsa multibackendPaul Kehrer2014-05-021-0/+5