From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 10 Mar 2012 13:50:22 +0000 (+0100)
Subject: Merge from torproject.org:
X-Git-Tag: userdir-ldap-0.3.85~71
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=acb95c57a55058d3fee491f8b5f8c55cb494392c;hp=acb95c57a55058d3fee491f8b5f8c55cb494392c;p=mirror%2Fuserdir-ldap.git

Merge from torproject.org:

- Allow sshRSAAuthKey for role accounts.
- Support ssh key attributes for gitolite export.
- Add ssh-gitolite support.
---