diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-02 12:56:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-02 12:56:45 -0400 |
| commit | 0a4a3de3def27a7c7f8a514546b33662d0cfe6c5 (patch) | |
| tree | 3872a4bd54487de1985fa8d35baa83b5ced627a8 /tor.spec.in | |
| parent | 9ac2f63e0f3f1fd333b23ee6e6c02ae7cf0f71d2 (diff) | |
| parent | df42eb0a18a9f6fe4b729a1c9a63bb6ab247f631 (diff) | |
| download | tor-0a4a3de3def27a7c7f8a514546b33662d0cfe6c5.tar.gz tor-0a4a3de3def27a7c7f8a514546b33662d0cfe6c5.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/dirserv.c
Diffstat (limited to 'tor.spec.in')
0 files changed, 0 insertions, 0 deletions