/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-03-08 00:05:04 UTC
  • mfrom: (826 trunk)
  • mto: This revision was merged to the branch mainline in revision 827.
  • Revision ID: teddy@recompile.se-20160308000504-6m8f4c9kkfmgg686
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
98
98
if sys.version_info.major == 2:
99
99
    str = unicode
100
100
 
101
 
version = "1.7.5"
 
101
version = "1.7.4"
102
102
stored_state_file = "clients.pickle"
103
103
 
104
104
logger = logging.getLogger()